From 289af37aba44b1f0058363eef0be197968fb4a34 Mon Sep 17 00:00:00 2001
From: Alasdair McLeay <penx@users.noreply.github.com>
Date: Wed, 6 Mar 2024 04:20:31 +0000
Subject: [PATCH 001/108] Fix "Form vs. fetcher" docs example code (#8981)

---
 docs/discussion/form-vs-fetcher.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/discussion/form-vs-fetcher.md b/docs/discussion/form-vs-fetcher.md
index 54216e21637..36e900a9a48 100644
--- a/docs/discussion/form-vs-fetcher.md
+++ b/docs/discussion/form-vs-fetcher.md
@@ -149,7 +149,7 @@ export async function loader({
   });
 }
 
-export function Recipes() {
+export default function Recipes() {
   const { recipes } = useLoaderData<typeof loader>();
   return (
     <ul>
@@ -185,7 +185,6 @@ const RecipeListItem: FunctionComponent<{
       <fetcher.Form method="post">
         <button
           disabled={isDeleting}
-          onClick={handleDelete}
           type="submit"
         >
           {isDeleting ? "Deleting..." : "Delete"}

From cc4dcf1e9f244341d4c73cfc614dd082ac95c65b Mon Sep 17 00:00:00 2001
From: Remix Run Bot <hello@remix.run>
Date: Wed, 6 Mar 2024 04:22:53 +0000
Subject: [PATCH 002/108] chore: format

---
 docs/discussion/form-vs-fetcher.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/docs/discussion/form-vs-fetcher.md b/docs/discussion/form-vs-fetcher.md
index 36e900a9a48..023615c38df 100644
--- a/docs/discussion/form-vs-fetcher.md
+++ b/docs/discussion/form-vs-fetcher.md
@@ -183,10 +183,7 @@ const RecipeListItem: FunctionComponent<{
     <li>
       <h2>{recipe.title}</h2>
       <fetcher.Form method="post">
-        <button
-          disabled={isDeleting}
-          type="submit"
-        >
+        <button disabled={isDeleting} type="submit">
           {isDeleting ? "Deleting..." : "Delete"}
         </button>
       </fetcher.Form>

From 19552aae437711152e7e6036ddaff00cc581411a Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Thu, 7 Mar 2024 11:19:45 -0500
Subject: [PATCH 003/108] Update date in release notes

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc1e0746f77..a1f672af335 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -161,7 +161,7 @@ Date: YYYY-MM-DD
 
 ## v2.8.1
 
-Date: 2024-03-06
+Date: 2024-03-07
 
 ### Patch Changes
 

From 4eede05b5f08bc1cd536f897f40685d026fe64df Mon Sep 17 00:00:00 2001
From: Johannes Goslar <jogo@kronberger-spiele.de>
Date: Thu, 7 Mar 2024 23:37:58 +0100
Subject: [PATCH 004/108] Document Vite Plugin React usage without Remix plugin
 (#9009)

Co-authored-by: Mark Dalgleish <mark.john.dalgleish@gmail.com>
---
 contributors.yml    |  1 +
 docs/future/vite.md | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/contributors.yml b/contributors.yml
index 24e5047e16d..119da700326 100644
--- a/contributors.yml
+++ b/contributors.yml
@@ -348,6 +348,7 @@
 - klauspaiva
 - knowler
 - konradkalemba
+- ksjogo
 - krolebord
 - kubaprzetakiewicz
 - kuldar
diff --git a/docs/future/vite.md b/docs/future/vite.md
index 0b28e47b700..dc7ba442e5c 100644
--- a/docs/future/vite.md
+++ b/docs/future/vite.md
@@ -1102,6 +1102,23 @@ For example, to use a Vite config specifically scoped to Remix:
 remix vite:dev --config vite.config.remix.ts
 ```
 
+When not providing the Remix Vite plugin, your setup might also need to provide [Vite Plugin React][vite-plugin-react]. For example, when using Vitest:
+
+```ts filename=vite.config.ts lines=[2,6]
+import { vitePlugin as remix } from "@remix-run/dev";
+import react from "@vitejs/plugin-react";
+import { defineConfig, loadEnv } from "vite";
+
+export default defineConfig({
+  plugins: [!process.env.VITEST ? remix() : react()],
+  test: {
+    environment: "happy-dom",
+    // Additionally, this is to load ".env.test" during vitest
+    env: loadEnv("test", process.cwd(), ""),
+  },
+});
+```
+
 #### Styles disappearing in development when document remounts
 
 When React is used to render the entire document (as Remix does) you can run into issues when elements are dynamically injected into the `head` element. If the document is re-mounted, the existing `head` element is removed and replaced with an entirely new one, removing any `style` elements that Vite injects during development.
@@ -1280,3 +1297,4 @@ We're definitely late to the Vite party, but we're excited to be here now!
 [how-fix-cjs-esm]: https://www.youtube.com/watch?v=jmNuEEtwkD4
 [presets]: ./presets
 [fix-up-css-imports-referenced-in-links]: #fix-up-css-imports-referenced-in-links
+[vite-plugin-react]: https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-react

From d18d98bc940c2e7cf03ca0176729ced7e952f9f1 Mon Sep 17 00:00:00 2001
From: Remix Run Bot <hello@remix.run>
Date: Thu, 7 Mar 2024 22:39:38 +0000
Subject: [PATCH 005/108] chore: format

---
 contributors.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributors.yml b/contributors.yml
index 119da700326..a188d371a4f 100644
--- a/contributors.yml
+++ b/contributors.yml
@@ -348,8 +348,8 @@
 - klauspaiva
 - knowler
 - konradkalemba
-- ksjogo
 - krolebord
+- ksjogo
 - kubaprzetakiewicz
 - kuldar
 - kumard3

From 24fa52c7fcccd5ae6f527bb8763c41f4e77a46f2 Mon Sep 17 00:00:00 2001
From: Mackie Underdown <macklinu@users.noreply.github.com>
Date: Sat, 9 Mar 2024 15:24:32 -0500
Subject: [PATCH 006/108] templates(deno): fix import maps docs link (#9023)

---
 contributors.yml         | 1 +
 templates/deno/README.md | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/contributors.yml b/contributors.yml
index a188d371a4f..a45aab8d936 100644
--- a/contributors.yml
+++ b/contributors.yml
@@ -390,6 +390,7 @@
 - m0nica
 - m5r
 - machour
+- macklinu
 - maferland
 - manan30
 - manosim
diff --git a/templates/deno/README.md b/templates/deno/README.md
index f13401acb0a..dc0798d05d0 100644
--- a/templates/deno/README.md
+++ b/templates/deno/README.md
@@ -29,7 +29,7 @@ Read about
   import { copy } from "https://deno.land/std@0.138.0/streams/conversion.ts";
   ```
 - ❌ Do not use
-  [import maps](https://deno.land/manual/linking_to_external_code/import_maps).
+  [import maps](https://docs.deno.com/runtime/manual/basics/import_maps).
 
 ## Development
 

From ea795f9d87da3367c0f719fc52bc904baa218f41 Mon Sep 17 00:00:00 2001
From: Mark Dalgleish <mark.john.dalgleish@gmail.com>
Date: Mon, 11 Mar 2024 12:13:30 +1100
Subject: [PATCH 007/108] Update docs to make Vite the default (#9017)

---
 docs/discussion/introduction.md               |  12 +-
 docs/discussion/server-vs-client.md           |  86 +++++++++-
 docs/file-conventions/-client.md              |  10 +-
 docs/file-conventions/-server.md              |  27 ++-
 docs/file-conventions/remix-config.md         |   6 +
 docs/file-conventions/routes.md               |   6 +-
 docs/file-conventions/vite-config.md          | 155 ++++++++++++++++++
 docs/future/vite.md                           | 152 ++---------------
 docs/guides/data-loading.md                   |   3 +-
 docs/guides/gotchas.md                        | 103 ++++++------
 docs/guides/local-tls.md                      |   3 +
 docs/guides/manual-mode.md                    |   3 +
 docs/guides/mdx.md                            |   7 +-
 docs/guides/migrating-react-router-app.md     |   4 +
 docs/guides/performance.md                    |  23 +--
 docs/guides/typescript.md                     |  34 ++--
 docs/index.md                                 |   2 +-
 docs/other-api/dev.md                         |  87 +++++++---
 docs/start/future-flags.md                    |  49 +++---
 docs/start/quickstart.md                      | 131 ++++++++-------
 docs/start/tutorial.md                        |  30 ++--
 docs/start/v2.md                              |   4 +
 docs/styling/bundling.md                      |   5 +
 docs/styling/css-imports.md                   |   3 +
 docs/styling/css-modules.md                   |   5 +
 docs/styling/css.md                           |  22 ++-
 docs/styling/postcss.md                       |   5 +
 docs/styling/tailwind.md                      |   7 +-
 docs/styling/vanilla-extract.md               |   5 +
 docs/tutorials/jokes.md                       |   4 +
 .../{.eslintrc.js => .eslintrc.cjs}           |   0
 templates/remix-tutorial/.gitignore           |   1 -
 templates/remix-tutorial/README.md            |   4 +-
 templates/remix-tutorial/app/root.tsx         |   2 -
 templates/remix-tutorial/package.json         |  13 +-
 templates/remix-tutorial/remix.config.js      |   5 -
 templates/remix-tutorial/remix.env.d.ts       |   2 -
 templates/remix-tutorial/tsconfig.json        |  10 +-
 templates/remix-tutorial/vite.config.ts       |  15 ++
 39 files changed, 659 insertions(+), 386 deletions(-)
 create mode 100644 docs/file-conventions/vite-config.md
 rename templates/remix-tutorial/{.eslintrc.js => .eslintrc.cjs} (100%)
 delete mode 100644 templates/remix-tutorial/remix.config.js
 delete mode 100644 templates/remix-tutorial/remix.env.d.ts
 create mode 100644 templates/remix-tutorial/vite.config.ts

diff --git a/docs/discussion/introduction.md b/docs/discussion/introduction.md
index c9d242f3bbc..68c30f145d8 100644
--- a/docs/discussion/introduction.md
+++ b/docs/discussion/introduction.md
@@ -14,10 +14,10 @@ Built on top of [React Router][react_router], Remix is four things:
 
 ## Compiler
 
-Everything in Remix starts with the compiler: `remix build`. Using [esbuild][esbuild], this creates a few things:
+Everything in Remix starts with the compiler: `remix vite:build`. Using [Vite], this creates a few things:
 
-1. A server HTTP handler, usually in `server/build/index.js` (it's configurable) that includes all routes and modules together to be able to render on the server and handle any other server-side requests for resources.
-2. A browser build, usually in `public/build/*`. This includes automatic code splitting by route, fingerprinted asset imports (like CSS and images), etc. Anything needed to run an application in the browser.
+1. A server HTTP handler, usually in `build/server/index.js` (it's configurable) that includes all routes and modules together to be able to render on the server and handle any other server-side requests for resources.
+2. A browser build, usually in `build/client/*`. This includes automatic code splitting by route, fingerprinted asset imports (like CSS and images), etc. Anything needed to run an application in the browser.
 3. An asset manifest. Both the client and the server use this manifest to know the entire dependency graph. This is useful for preloading resources in the initial server render as well as prefetching them for client-side transitions. This is how Remix is able to eliminate the render+fetch waterfalls so common in web apps today.
 
 With these build artifacts, an application can be deployed to any hosting service that runs JavaScript.
@@ -38,7 +38,9 @@ const app = express();
 
 app.all(
   "*",
-  remix.createRequestHandler({ build: require("./build") })
+  remix.createRequestHandler({
+    build: require("./build/server"),
+  })
 );
 ```
 
@@ -222,7 +224,7 @@ For example. Building a plain HTML form and server-side handler in a back-end he
 
 We borrowed an old term and called this Progressive Enhancement in Remix. Start small with a plain HTML form (Remix scales down) and then scale the UI up when you have the time and ambition.
 
-[esbuild]: https://esbuild.github.io/
+[vite]: https://vitejs.dev
 [cf]: https://workers.cloudflare.com/
 [deno]: https://deno.com/deploy/docs
 [fetch]: https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API
diff --git a/docs/discussion/server-vs-client.md b/docs/discussion/server-vs-client.md
index 22fd6d73b60..6f30d56a027 100644
--- a/docs/discussion/server-vs-client.md
+++ b/docs/discussion/server-vs-client.md
@@ -7,7 +7,7 @@ order: 5
 
 Remix runs your app on the server as well as in the browser. However, it doesn't run all of your code in both places.
 
-During the build step, the compiler creates both a server build and a client build. The server build bundles up everything into a single module, but the client build splits your app up into multiple bundles to optimize loading in the browser. It also removes server code from the bundles.
+During the build step, the compiler creates both a server build and a client build. The server build bundles up everything into a single module (or multiple modules when using [server bundles][server-bundles]), but the client build splits your app up into multiple bundles to optimize loading in the browser. It also removes server code from the bundles.
 
 The following route exports and the dependencies used within them are removed from the client build:
 
@@ -97,15 +97,84 @@ export default function Component() {
 }
 ```
 
-## Forcing Code Out of the Browser or Server Builds
+## Splitting Up Client and Server Code
 
-You can force code out of either the client or the server with the [`*.client.ts`][file_convention_client] and [`*.server.ts`][file_convention_server] conventions.
+Out of the box, Vite doesn't support mixing server-only code with client-safe code in the same module.
+Remix is able to make an exception for routes because we know which exports are server-only and can remove them from the client.
 
-While rare, sometimes server code makes it to client bundles because of how the compiler determines the dependencies of a route module, or because you accidentally try to use it in code that needs to ship to the client. You can force it out by adding `*.server.ts` on the end of the file name.
+There are a few ways to isolate server-only code in Remix.
+The simplest approach is to use [`.server`][file_convention_server] and [`.client`][file_convention_client] modules.
 
-For example, we could name a module `app/user.server.ts` instead of `app/user.ts` to ensure that the code in that module is never bundled into the client — even if you try to use it in the component.
+#### `.server` modules
 
-Additionally, you may depend on client libraries that are unsafe to even bundle on the server — maybe it tries to access [`window`][window_global] by simply being imported. You can likewise remove these modules from the server build by appending `*.client.ts` to the file name.
+While not strictly necessary, [`.server` modules][file_convention_server] are a good way to explicitly mark entire modules as server-only.
+The build will fail if any code in a `.server` file or `.server` directory accidentally ends up in the client module graph.
+
+```txt
+app
+├── .server 👈 marks all files in this directory as server-only
+│   ├── auth.ts
+│   └── db.ts
+├── cms.server.ts 👈 marks this file as server-only
+├── root.tsx
+└── routes
+    └── _index.tsx
+```
+
+`.server` modules must be within your Remix app directory.
+
+<docs-warning>`.server` directories are only supported when using [Remix Vite][remix-vite]. The [Classic Remix Compiler][classic-remix-compiler] only supports `.server` files.</docs-warning>
+
+#### `.client` modules
+
+You may depend on client libraries that are unsafe to even bundle on the server — maybe it tries to access [`window`][window_global] by simply being imported.
+
+You can remove the contents of these modules from the server build by appending `*.client.ts` to the file name or nesting them within a `.client` directory.
+
+<docs-warning>`.client` directories are only supported when using [Remix Vite][remix-vite]. The [Classic Remix Compiler][classic-remix-compiler] only supports `.client` files.</docs-warning>
+
+#### vite-env-only
+
+If you want to mix server-only code and client-safe code in the same module, you
+can use <nobr>[vite-env-only][vite-env-only]</nobr>.
+This Vite plugin allows you to explicitly mark any expression as server-only so that it gets
+replaced with `undefined` in the client.
+
+For example, once you've added the plugin to your [Vite config][vite-config], you can wrap any server-only exports with `serverOnly$`:
+
+```tsx
+import { serverOnly$ } from "vite-env-only";
+
+import { db } from "~/.server/db";
+
+export const getPosts = serverOnly$(async () => {
+  return db.posts.findMany();
+});
+
+export const PostPreview = ({ title, description }) => {
+  return (
+    <article>
+      <h2>{title}</h2>
+      <p>{description}</p>
+    </article>
+  );
+};
+```
+
+This example would be compiled into the following code for the client:
+
+```tsx
+export const getPosts = undefined;
+
+export const PostPreview = ({ title, description }) => {
+  return (
+    <article>
+      <h2>{title}</h2>
+      <p>{description}</p>
+    </article>
+  );
+};
+```
 
 [action]: ../route/action
 [headers]: ../route/headers
@@ -113,3 +182,8 @@ Additionally, you may depend on client libraries that are unsafe to even bundle
 [file_convention_client]: ../file-conventions/-client
 [file_convention_server]: ../file-conventions/-server
 [window_global]: https://developer.mozilla.org/en-US/docs/Web/API/Window/window
+[server-bundles]: ../future/server-bundles
+[vite-config]: ../file-conventions/vite-configuration
+[vite-env-only]: https://github.com/pcattori/vite-env-only
+[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ../future/vite
diff --git a/docs/file-conventions/-client.md b/docs/file-conventions/-client.md
index 828165d1383..6a4a5f76536 100644
--- a/docs/file-conventions/-client.md
+++ b/docs/file-conventions/-client.md
@@ -1,11 +1,11 @@
 ---
-title: "*.client.ts extension"
+title: ".client modules"
 toc: false
 ---
 
-# `*.client.ts`
+# `.client` modules
 
-While uncommon, you may have a file or dependency that uses module side effects in the browser. You can use `*.client.ts` on file names to force them out of server bundles.
+While uncommon, you may have a file or dependency that uses module side effects in the browser. You can use `*.client.ts` on file names or nest files within `.client` directories to force them out of server bundles.
 
 ```ts filename=feature-check.client.ts
 // this would break the server
@@ -23,6 +23,10 @@ console.log(supportsVibrationAPI);
 // client: true | false
 ```
 
+<docs-warning>`.client` directories are only supported when using [Remix Vite][remix-vite]. The [Classic Remix Compiler][classic-remix-compiler] only supports `.client` files.</docs-warning>
+
 Refer to the Route Module section in the sidebar for more information.
 
 [use_effect]: https://react.dev/reference/react/useEffect
+[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ../future/vite
diff --git a/docs/file-conventions/-server.md b/docs/file-conventions/-server.md
index 32cea0f7d6e..57530879e99 100644
--- a/docs/file-conventions/-server.md
+++ b/docs/file-conventions/-server.md
@@ -1,10 +1,31 @@
 ---
-title: "*.server.ts extension"
+title: ".server modules"
 toc: false
 ---
 
-# `*.server.ts`
+# `.server` modules
 
-While not always necessary, you can use `*.server.ts` on file names to force them out of client bundles. Usually the compiler is fine, but if you've got a server dependency with module side effects, move it into a `your-name.server.ts` file to ensure it is removed from client bundles.
+While not strictly necessary, `.server` modules are a good way to explicitly mark entire modules as server-only.
+The build will fail if any code in a `.server` file or `.server` directory accidentally ends up in the client module graph.
+
+```txt
+app
+├── .server 👈 marks all files in this directory as server-only
+│   ├── auth.ts
+│   └── db.ts
+├── cms.server.ts 👈 marks this file as server-only
+├── root.tsx
+└── routes
+    └── _index.tsx
+```
+
+`.server` modules must be within your Remix app directory.
 
 Refer to the Route Module section in the sidebar for more information.
+
+<docs-warning>`.server` directories are only supported when using [Remix Vite][remix-vite]. The [Classic Remix Compiler][classic-remix-compiler] only supports `.server` files.</docs-warning>
+
+<docs-warning>When using the [Classic Remix Compiler][classic-remix-compiler], `.server` modules are replaced with empty modules and will not result in a compilation error. Note that this can result in runtime errors.</docs-warning>
+
+[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ../future/vite
diff --git a/docs/file-conventions/remix-config.md b/docs/file-conventions/remix-config.md
index 9f2c17e900c..bd5c4638fae 100644
--- a/docs/file-conventions/remix-config.md
+++ b/docs/file-conventions/remix-config.md
@@ -1,9 +1,12 @@
 ---
 title: remix.config.js
+hidden: true
 ---
 
 # remix.config.js
 
+<docs-warning>`remix.config.js` is only relevant when using the [Classic Remix Compiler][classic-remix-compiler]. When using [Remix Vite][remix-vite], this file should not be present in your project. Instead, Remix configuration should be provided to the Remix plugin in your [Vite config][vite-config].</docs-warning>
+
 This file has a few build and development configuration options, but does not actually run on your server.
 
 ```js filename=remix.config.js
@@ -282,3 +285,6 @@ There are a few conventions that Remix uses you should be aware of.
 [use-fetchers]: ../hooks/use-fetchers
 [use-fetcher]: ../hooks/use-fetcher
 [relativesplatpath]: https://reactrouter.com/en/main/hooks/use-resolved-path#splat-paths
+[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ../future/vite
+[vite-config]: ./vite-configuration
diff --git a/docs/file-conventions/routes.md b/docs/file-conventions/routes.md
index f695323e82d..743a650a54b 100644
--- a/docs/file-conventions/routes.md
+++ b/docs/file-conventions/routes.md
@@ -4,7 +4,7 @@ title: Route File Naming
 
 # Route File Naming
 
-While you can configure routes in [`remix.config.js`][remix_config], most routes are created with this file system convention. Add a file, get a route.
+While you can configure routes via [the "routes" plugin option][routes_config], most routes are created with this file system convention. Add a file, get a route.
 
 Please note that you can use either `.js`, `.jsx`, `.ts` or `.tsx` file extensions. We'll stick with `.tsx` in the examples to avoid duplication.
 
@@ -381,7 +381,7 @@ Our general recommendation for scale is to make every route a folder and put the
 
 ## More Flexibility
 
-While we like this file convention, we recognize that at a certain scale many organizations won't like it. You can always define your routes programmatically in [`remix.config.js`][remix_config].
+While we like this file convention, we recognize that at a certain scale many organizations won't like it. You can always define your routes programmatically in [`vite.config.ts`][routes_config].
 
 There's also the [`remix-flat-routes`][flat_routes] third-party package with configurable options beyond the defaults in Remix.
 
@@ -393,7 +393,7 @@ There's also the [`remix-flat-routes`][flat_routes] third-party package with con
 [index_route]: ../discussion/routes#index-routes
 [nested_routing]: ../discussion/routes#what-is-nested-routing
 [nested_routes]: #nested-routes
-[remix_config]: ./remix-config#routes
+[routes_config]: ./vite-config#routes
 [dot_delimiters]: #dot-delimiters
 [dynamic_segments]: #dynamic-segments
 [flat_routes]: https://github.com/kiliman/remix-flat-routes
diff --git a/docs/file-conventions/vite-config.md b/docs/file-conventions/vite-config.md
new file mode 100644
index 00000000000..71473e6bab9
--- /dev/null
+++ b/docs/file-conventions/vite-config.md
@@ -0,0 +1,155 @@
+---
+title: vite.config.ts
+---
+
+# vite.config.ts
+
+<docs-warning>If your project is still using the [Classic Remix Compiler][classic-remix-compiler], you should refer to the [remix.config.js documentation][remix-config] instead.</docs-warning>
+
+Remix uses [Vite] to compile your application. You'll need to provide a Vite config file with the Remix Vite plugin. Here's the minimum configuration you'll need:
+
+```ts filename=vite.config.ts
+import { vitePlugin as remix } from "@remix-run/dev";
+import { defineConfig } from "vite";
+
+export default defineConfig({
+  plugins: [remix()],
+});
+```
+
+<docs-info>Vite supports using a `.js` file for your config, but we recommend using TypeScript to help ensure your configuration is valid.</docs-info>
+
+## Remix Vite Plugin Config
+
+```js filename=vite.config.ts
+import { vitePlugin as remix } from "@remix-run/dev";
+import { defineConfig } from "vite";
+
+export default defineConfig({
+  plugins: [
+    remix({
+      basename: "/",
+      buildDirectory: "build",
+      future: {
+        /* any enabled future flags */
+      },
+      ignoredRouteFiles: ["**/*.css"],
+      routes(defineRoutes) {
+        return defineRoutes((route) => {
+          route("/somewhere/cool/*", "catchall.tsx");
+        });
+      },
+      serverBuildFile: "index.js",
+    }),
+  ],
+});
+```
+
+#### appDirectory
+
+The path to the `app` directory, relative to the project root. Defaults to
+`"app"`.
+
+#### future
+
+The `future` config lets you opt-into future breaking changes via [Future Flags][future-flags]. The following future flags currently exist in Remix v2 and will become the default behavior in Remix v3:
+
+- **`v3_fetcherPersist`**: Change fetcher persistence/cleanup behavior in 2 ways ([RFC][fetcherpersist-rfc]):
+  - Fetchers are no longer removed on unmount, and remain exposed via [`useFetchers`][use-fetchers] until they return to an `idle` state
+  - Fetchers that complete while still mounted no longer persist in [`useFetchers`][use-fetchers] since you can access those fetchers via [`useFetcher`][use-fetcher]
+- **`v3_relativeSplatPath`**: Fixes buggy relative path resolution in splat routes. Please see the [React Router docs][relativesplatpath] for more information.
+- **`v3_throwAbortReason`**: When a server-side request is aborted, Remix will throw the `request.signal.reason` instead of an error such as `new Error("query() call aborted...")`
+
+#### ignoredRouteFiles
+
+This is an array of globs (via [minimatch][minimatch]) that Remix will match to
+files while reading your `app/routes` directory. If a file matches, it will be
+ignored rather than treated like a route module. This is useful for ignoring
+CSS/test files you wish to colocate.
+
+#### routes
+
+A function for defining custom routes, in addition to those already defined
+using the filesystem convention in `app/routes`. Both sets of routes will be merged.
+
+```ts filename=vite.config.ts
+import { vitePlugin as remix } from "@remix-run/dev";
+import { defineConfig } from "vite";
+
+export default defineConfig({
+  plugins: [
+    remix({
+      routes: async (defineRoutes) => {
+        // If you need to do async work, do it before calling `defineRoutes`, we use
+        // the call stack of `route` inside to set nesting.
+
+        return defineRoutes((route) => {
+          // A common use for this is catchall routes.
+          // - The first argument is the React Router path to match against
+          // - The second is the relative filename of the route handler
+          route("/some/path/*", "catchall.tsx");
+
+          // if you want to nest routes, use the optional callback argument
+          route("some/:path", "some/route/file.js", () => {
+            // - path is relative to parent path
+            // - filenames are still relative to the app directory
+            route("relative/path", "some/other/file");
+          });
+        });
+      },
+    }),
+  ],
+});
+```
+
+#### serverModuleFormat
+
+The output format of the server build, which can either be `"cjs"` or `"esm"`.
+Defaults to `"esm"`.
+
+#### buildDirectory
+
+The path to the build directory, relative to the project root. Defaults to
+`"build"`.
+
+#### basename
+
+An optional basename for your route paths, passed through to the [React Router "basename" option][rr-basename]. Please note that this is different from your _asset_ paths. You can can configure the [base public path][vite-public-base-path] for your assets via the [Vite "base" option][vite-base].
+
+#### buildEnd
+
+A function that is called after the full Remix build is complete.
+
+#### manifest
+
+Whether to write a `.remix/manifest.json` file to the build directory. Defaults
+to `false`.
+
+#### presets
+
+An array of [presets] to ease integration with other tools and hosting providers.
+
+#### serverBuildFile
+
+The name of the server file generated in the server build directory. Defaults to `"index.js"`.
+
+#### serverBundles
+
+A function for assigning addressable routes to [server bundles][server-bundles].
+
+You may also want to enable the `manifest` option since, when server bundles are enabled, it contains mappings between routes and server bundles.
+
+[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
+[remix-config]: ./remix-config
+[vite]: https://vitejs.dev
+[future-flags]: ../start/future-flags
+[fetcherpersist-rfc]: https://github.com/remix-run/remix/discussions/7698
+[use-fetchers]: ../hooks/use-fetchers
+[use-fetcher]: ../hooks/use-fetcher
+[relativesplatpath]: https://reactrouter.com/en/main/hooks/use-resolved-path#splat-paths
+[minimatch]: https://npm.im/minimatch
+[presets]: ../future/presets
+[server-bundles]: ../future/server-bundles
+[rr-basename]: https://reactrouter.com/routers/create-browser-router#basename
+[vite-public-base-path]: https://vitejs.dev/config/shared-options.html#base
+[vite-base]: https://vitejs.dev/config/shared-options.html#base
diff --git a/docs/future/vite.md b/docs/future/vite.md
index dc7ba442e5c..10201267dfd 100644
--- a/docs/future/vite.md
+++ b/docs/future/vite.md
@@ -6,6 +6,14 @@ title: Vite
 
 [Vite][vite] is a powerful, performant and extensible development environment for JavaScript projects. In order to improve and extend Remix's bundling capabilities, we now support Vite as an alternative compiler. In the future, Vite will become the default compiler for Remix.
 
+## Classic Remix Compiler vs. Remix Vite
+
+The existing Remix compiler, accessed via the `remix build` and `remix dev` CLI commands and configured via `remix.config.js`, is now referred to as the "Classic Remix Compiler".
+
+The Remix Vite plugin and the `remix vite:build` and `remix vite:dev` CLI commands are collectively referred to as "Remix Vite".
+
+Moving forwards, documentation will assume usage of Remix Vite unless otherwise stated.
+
 ## Getting started
 
 We've got a few different Vite-based templates to get you started.
@@ -25,68 +33,7 @@ These templates include a `vite.config.ts` file which is where the Remix Vite pl
 
 ## Configuration
 
-The Vite plugin does not use [`remix.config.js`][remix-config]. Instead, the plugin accepts options directly.
-
-For example, to configure `ignoredRouteFiles`:
-
-```ts filename=vite.config.ts lines=[7]
-import { vitePlugin as remix } from "@remix-run/dev";
-import { defineConfig } from "vite";
-
-export default defineConfig({
-  plugins: [
-    remix({
-      ignoredRouteFiles: ["**/*.css"],
-    }),
-  ],
-});
-```
-
-All other bundling-related options are now [configured with Vite][vite-config]. This means you have much greater control over the bundling process.
-
-#### Supported Remix config options
-
-The following subset of Remix config options are supported:
-
-- [appDirectory][app-directory]
-- [future][future]
-- [ignoredRouteFiles][ignored-route-files]
-- [routes][routes]
-- [serverModuleFormat][server-module-format]
-
-The Vite plugin also accepts the following additional options:
-
-#### buildDirectory
-
-The path to the build directory, relative to the project root. Defaults to
-`"build"`.
-
-#### basename
-
-An optional basename for your route paths, passed through to the [React Router "basename" option][rr-basename]. Please note that this is different from your _asset_ paths. You can can configure the [base public path][vite-public-base-path] for your assets via the [Vite "base" option][vite-base].
-
-#### buildEnd
-
-A function that is called after the full Remix build is complete.
-
-#### manifest
-
-Whether to write a `.remix/manifest.json` file to the build directory. Defaults
-to `false`.
-
-#### presets
-
-An array of [presets] to ease integration with other tools and hosting providers.
-
-#### serverBuildFile
-
-The name of the server file generated in the server build directory. Defaults to `"index.js"`.
-
-#### serverBundles
-
-A function for assigning addressable routes to [server bundles][server-bundles].
-
-You may also want to enable the `manifest` option since, when server bundles are enabled, it contains mappings between routes and server bundles.
+The Remix Vite plugin is configured via a `vite.config.ts` file at the root of your project. For more information, see our [Vite config documentation][vite-config].
 
 ## Cloudflare
 
@@ -239,73 +186,7 @@ export const onRequest = createPagesFunctionHandler({
 
 ## Splitting up client and server code
 
-Remix lets you write code that [runs on both the client and the server][server-vs-client].
-Out-of-the-box, Vite doesn't support mixing server-only code with client-safe code in the same module.
-Remix is able to make an exception for routes because we know which exports are server-only and can remove them from the client.
-
-There are a few ways to isolate server-only code in Remix.
-The simplest approach is to use `.server` modules.
-
-#### `.server` modules
-
-While not strictly necessary, `.server` modules are a good way to explicitly mark entire modules as server-only.
-The build will fail if any code in a `.server` file or `.server` directory accidentally ends up in the client module graph.
-
-```txt
-app
-├── .server 👈 marks all files in this directory as server-only
-│   ├── auth.ts
-│   └── db.ts
-├── cms.server.ts 👈 marks this file as server-only
-├── root.tsx
-└── routes
-    └── _index.tsx
-```
-
-`.server` modules must be within your Remix app directory.
-
-#### vite-env-only
-
-If you want to mix server-only code and client-safe code in the same module, you
-can use <nobr>[vite-env-only][vite-env-only]</nobr>.
-This Vite plugin allows you to explicitly mark any expression as server-only so that it gets
-replaced with `undefined` in the client.
-
-For example, once you've added the plugin to your Vite config, you can wrap any server-only exports with `serverOnly$`:
-
-```tsx
-import { serverOnly$ } from "vite-env-only";
-
-import { db } from "~/.server/db";
-
-export const getPosts = serverOnly$(async () => {
-  return db.posts.findMany();
-});
-
-export const PostPreview = ({ title, description }) => {
-  return (
-    <article>
-      <h2>{title}</h2>
-      <p>{description}</p>
-    </article>
-  );
-};
-```
-
-This example would be compiled into the following code for the client:
-
-```tsx
-export const getPosts = undefined;
-
-export const PostPreview = ({ title, description }) => {
-  return (
-    <article>
-      <h2>{title}</h2>
-      <p>{description}</p>
-    </article>
-  );
-};
-```
+Vite handles mixed use of client and server code differently to the Classic Remix compiler. For more information, see our documentation on [splitting up client and server code][splitting-up-client-and-server-code].
 
 ## New build output paths
 
@@ -318,8 +199,6 @@ This also means that the following configuration defaults have been changed:
 - [publicPath][public-path] has been replaced by [Vite's "base" option][vite-base] which defaults to `"/"` rather than `"/build/"`.
 - [serverBuildPath][server-build-path] has been replaced by `serverBuildFile` which defaults to `"index.js"`. This file will be written into the server directory within your configured `buildDirectory`.
 
-## Additional features & plugins
-
 One of the reasons that Remix is moving to Vite is, so you have less to learn when adopting Remix.
 This means that, for any additional bundling features you'd like to use, you should reference [Vite documentation][vite] and the [Vite plugin community][vite-plugins] rather than the Remix documentation.
 
@@ -1211,19 +1090,11 @@ Finally, we were inspired by how other frameworks implemented Vite support:
 - [SolidStart][solidstart]
 - [SvelteKit][sveltekit]
 
-We're definitely late to the Vite party, but we're excited to be here now!
-
 [vite]: https://vitejs.dev
 [template-vite-cloudflare]: https://github.com/remix-run/remix/tree/main/templates/vite-cloudflare
-[remix-config]: ../file-conventions/remix-config
-[app-directory]: ../file-conventions/remix-config#appdirectory
-[future]: ../file-conventions/remix-config#future
-[ignored-route-files]: ../file-conventions/remix-config#ignoredroutefiles
 [public-path]: ../file-conventions/remix-config#publicpath
-[routes]: ../file-conventions/remix-config#routes
 [server-build-path]: ../file-conventions/remix-config#serverbuildpath
-[server-module-format]: ../file-conventions/remix-config#servermoduleformat
-[vite-config]: https://vitejs.dev/config
+[vite-config]: ../file-conventions/vite-config.md
 [vite-plugins]: https://vitejs.dev/plugins
 [vite-features]: https://vitejs.dev/guide/features
 [supported-remix-config-options]: #configuration
@@ -1298,3 +1169,4 @@ We're definitely late to the Vite party, but we're excited to be here now!
 [presets]: ./presets
 [fix-up-css-imports-referenced-in-links]: #fix-up-css-imports-referenced-in-links
 [vite-plugin-react]: https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-react
+[splitting-up-client-and-server-code]: ../discussion/server-vs-client.md
diff --git a/docs/guides/data-loading.md b/docs/guides/data-loading.md
index 4afdd479af8..833ad163b06 100644
--- a/docs/guides/data-loading.md
+++ b/docs/guides/data-loading.md
@@ -47,7 +47,7 @@ export default function Products() {
 
 The component renders on the server and in the browser. The loader _only runs on the server_. That means our hard-coded products array doesn't get included in the browser bundles, and it's safe to use server-only for APIs and SDKs for things like database, payment processing, content management systems, etc.
 
-If your server-side modules end up in client bundles, move the imports for those modules to a file named `{something}.server.ts` with the `.server.ts` suffix to ensure they are excluded.
+If your server-side modules end up in client bundles, refer to our guide on [server vs. client code execution][server-vs-client-code].
 
 ## Route Params
 
@@ -764,3 +764,4 @@ export default function RouteComp() {
 [url]: https://developer.mozilla.org/en-US/docs/Web/API/URL
 [use-submit]: ../hooks/use-submit
 [useloaderdata]: ../hooks/use-loader-data
+[server-vs-client-code]: ../discussion/server-vs-client
diff --git a/docs/guides/gotchas.md b/docs/guides/gotchas.md
index ac9aaf17109..4bc42abd0e6 100644
--- a/docs/guides/gotchas.md
+++ b/docs/guides/gotchas.md
@@ -8,8 +8,58 @@ Rendering your app on the server and in the browser with React has some inherent
 
 This document should help you get over these bumps.
 
+## `typeof window` checks
+
+Because the same JavaScript code can run in the browser as well as the server, sometimes you need to have a part of your code that only runs in one context or the other:
+
+```ts bad
+if (typeof window === "undefined") {
+  // running in a server environment
+} else {
+  // running in a browser environment
+}
+```
+
+This works fine in a Node.js environment, however, Deno actually supports `window`! So if you really want to check whether you're running in the browser, it's better to check for `document` instead:
+
+```ts good
+if (typeof document === "undefined") {
+  // running in a server environment
+} else {
+  // running in a browser environment
+}
+```
+
+This will work for all JS environments (Node.js, Deno, Workers, etc.).
+
+## Browser extensions injecting code
+
+You may run into this warning in the browser:
+
+```
+Warning: Did not expect server HTML to contain a <script> in <html>.
+```
+
+This is a hydration warning from React, and is most likely due to one of your browser extensions injecting scripts into the server-rendered HTML, creating a difference with the resulting HTML.
+
+Check out the page in incognito mode, the warning should disappear.
+
+## Writing to Sessions in `loader`s
+
+Typically, you should only write to sessions in actions, but there are occasions where it makes sense in loaders (anonymous users, navigation tracking, etc.)
+
+While multiple loaders can _read_ from the same session, _writing_ to a session in loaders can cause problems.
+
+Remix loaders run in parallel, and sometimes in separate requests (client transitions call [`fetch`][fetch] for each loader). If one loader is writing to a session while another is attempting to read from it, you will hit bugs and/or non-deterministic behavior.
+
+Additionally, sessions are built on cookies which come from the browser's request. After committing a session, it goes to the browser in a [`Set-Cookie`][set_cookie_header] header which is then sent back to the server on the next request in the [`Cookie`][cookie_header] header. Regardless of parallel loaders, you can't write to a cookie with `Set-Cookie` and then attempt to read it from the original request `Cookie` and expect updated values. It needs to make a round trip to the browser first and come from the next request.
+
+If you need to write to a session in a loader, ensure the loader doesn't share that session with any other loaders.
+
 ## Server Code in Client Bundles
 
+<docs-warning>This section is only relevant if you're using the [Classic Remix Compiler][classic-remix-compiler].</docs-warning>
+
 You may run into this strange error in the browser. It almost always means that server code made it into browser bundles.
 
 ```
@@ -97,6 +147,8 @@ When you import a third-party module, Remix checks the `package.json` of that pa
 
 ## Importing ESM Packages
 
+<docs-warning>This section is only relevant if you're using the [Classic Remix Compiler][classic-remix-compiler].</docs-warning>
+
 You may try importing an ESM-only package into your app and see an error like this when server rendering:
 
 ```
@@ -130,44 +182,10 @@ You may ask why we don't just bundle everything for the server. We could, but th
 
 With major deployment platforms now supporting ESM server side, we're confident the future is brighter than the past here. We're still working on a solid dev experience for ESM server builds, our current approach relies on some things that you can't do in ESM. We'll get there.
 
-## `typeof window` checks
-
-Because the same JavaScript code can run in the browser as well as the server, sometimes you need to have a part of your code that only runs in one context or the other:
-
-```ts bad
-if (typeof window === "undefined") {
-  // running in a server environment
-} else {
-  // running in a browser environment
-}
-```
-
-This works fine in a Node.js environment, however, Deno actually supports `window`! So if you really want to check whether you're running in the browser, it's better to check for `document` instead:
-
-```ts good
-if (typeof document === "undefined") {
-  // running in a server environment
-} else {
-  // running in a browser environment
-}
-```
-
-This will work for all JS environments (Node.js, Deno, Workers, etc.).
-
-## Browser extensions injecting code
-
-You may run into this warning in the browser:
-
-```
-Warning: Did not expect server HTML to contain a <script> in <html>.
-```
-
-This is a hydration warning from React, and is most likely due to one of your browser extensions injecting scripts into the server-rendered HTML, creating a difference with the resulting HTML.
-
-Check out the page in incognito mode, the warning should disappear.
-
 ## CSS bundle being incorrectly tree-shaken
 
+<docs-warning>This section is only relevant if you're using the [Classic Remix Compiler][classic-remix-compiler].</docs-warning>
+
 When using [CSS bundling features][css_bundling] in combination with `export *` (e.g. when using an index file like `components/index.ts` that re-exports from all subdirectories) you may find that styles from the re-exported modules are missing from the build output.
 
 This is due to an [issue with `esbuild`'s CSS tree shaking][esbuild_css_tree_shaking_issue]. As a workaround, you should use named re-exports instead.
@@ -179,18 +197,6 @@ This is due to an [issue with `esbuild`'s CSS tree shaking][esbuild_css_tree_sha
 
 Note that, even if this issue didn't exist, we'd still recommend using named re-exports! While it may introduce a bit more boilerplate, you get explicit control over the module's public interface rather than inadvertently exposing everything.
 
-## Writing to Sessions in `loader`s
-
-Typically, you should only write to sessions in actions, but there are occasions where it makes sense in loaders (anonymous users, navigation tracking, etc.)
-
-While multiple loaders can _read_ from the same session, _writing_ to a session in loaders can cause problems.
-
-Remix loaders run in parallel, and sometimes in separate requests (client transitions call [`fetch`][fetch] for each loader). If one loader is writing to a session while another is attempting to read from it, you will hit bugs and/or non-deterministic behavior.
-
-Additionally, sessions are built on cookies which come from the browser's request. After committing a session, it goes to the browser in a [`Set-Cookie`][set_cookie_header] header which is then sent back to the server on the next request in the [`Cookie`][cookie_header] header. Regardless of parallel loaders, you can't write to a cookie with `Set-Cookie` and then attempt to read it from the original request `Cookie` and expect updated values. It needs to make a round trip to the browser first and come from the next request.
-
-If you need to write to a session in a loader, ensure the loader doesn't share that session with any other loaders.
-
 [esbuild]: https://esbuild.github.io
 [parse_multipart_form_data_upload_handler]: ../utils/parse-multipart-form-data#uploadhandler
 [server_dependencies_to_bundle]: ../file-conventions/remix-config#serverdependenciestobundle
@@ -200,3 +206,4 @@ If you need to write to a session in a loader, ensure the loader doesn't share t
 [fetch]: https://developer.mozilla.org/en-US/docs/Web/API/fetch
 [set_cookie_header]: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie
 [cookie_header]: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cookie
+[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
diff --git a/docs/guides/local-tls.md b/docs/guides/local-tls.md
index d7535617f4e..474c51f6247 100644
--- a/docs/guides/local-tls.md
+++ b/docs/guides/local-tls.md
@@ -4,6 +4,8 @@ title: "Local TLS"
 
 # Local TLS
 
+<docs-warning>This guide is currently only relevant when using the [Classic Remix Compiler][classic-remix-compiler].</docs-warning>
+
 It's simpler to use HTTP locally, but if you really need to use HTTPS locally, here's how to do it.
 
 <docs-warning>
@@ -116,3 +118,4 @@ remix dev --tls-key=key.pem --tls-cert=cert.pem -c "node ./server.js"
 Your app should now be running with local TLS!
 
 [mkcert]: https://github.com/FiloSottile/mkcert#installation
+[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
diff --git a/docs/guides/manual-mode.md b/docs/guides/manual-mode.md
index a470cce5acb..b201c089018 100644
--- a/docs/guides/manual-mode.md
+++ b/docs/guides/manual-mode.md
@@ -4,6 +4,8 @@ title: Manual Dev Server
 
 # Manual mode
 
+<docs-warning>This guide is only relevant when using the [Classic Remix Compiler][classic-remix-compiler].</docs-warning>
+
 By default, `remix dev` drives like an automatic.
 It keeps your app server up-to-date with the latest code changes by automatically restarting the app server whenever file changes are detected in your app code.
 This is a simple approach that stays out of your way, and we think will work well for most apps.
@@ -308,3 +310,4 @@ There is also a handy [`remember` utility][remember] that can help out here if y
 [templates]: https://github.com/remix-run/remix/blob/main/templates
 [community_examples]: https://github.com/xHomu/remix-v2-server
 [remember]: https://npm.im/@epic-web/remember
+[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
diff --git a/docs/guides/mdx.md b/docs/guides/mdx.md
index 9a6047a69c2..8bc2b01f96d 100644
--- a/docs/guides/mdx.md
+++ b/docs/guides/mdx.md
@@ -5,9 +5,11 @@ description: Remix makes integrating MDX into your project a breeze with built i
 
 # MDX
 
+<docs-warning>This documentation is only relevant when using the [Classic Remix Compiler][classic-remix-compiler]. Vite consumers wanting to use MDX should use the [MDX Rollup (and Vite) plugin][mdx-plugin].</docs-warning>
+
 While we believe that a strong separation of data and display is important, we understand that formats that mix the two such as [MDX][mdx] (Markdown with embedded JSX components) have become a popular and powerful authoring format for developers.
 
-<docs-warning>Rather than compiling your content at build-time like this document demonstrates, it's typically better UX and DX if you do this at runtime via something like <a href="https://github.com/kentcdodds/mdx-bundler">mdx-bundler</a>. It's also much more customizable and powerful. However, if you prefer to do this compilation at build-time, continue reading.</docs-warning>
+<docs-info>Rather than compiling your content at build-time like this document demonstrates, it's typically better UX and DX if you do this at runtime via something like <a href="https://github.com/kentcdodds/mdx-bundler">mdx-bundler</a>. It's also much more customizable and powerful. However, if you prefer to do this compilation at build-time, continue reading.</docs-info>
 
 Remix has built-in support for using MDX at build-time in two ways:
 
@@ -202,6 +204,9 @@ exports.mdx = async (filename) => {
 };
 ```
 
+[remix-vite]: ../future//vite
+[mdx-plugin]: https://mdxjs.com/packages/rollup
 [mdx]: https://mdxjs.com
 [yaml]: https://yaml.org
 [mdx-bundler]: https://github.com/kentcdodds/mdx-bundler
+[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
diff --git a/docs/guides/migrating-react-router-app.md b/docs/guides/migrating-react-router-app.md
index 735f20a1c50..dddd004bd68 100644
--- a/docs/guides/migrating-react-router-app.md
+++ b/docs/guides/migrating-react-router-app.md
@@ -7,6 +7,8 @@ description: Migrating your React Router app to Remix can be done all at once or
 
 # Migrating your React Router App to Remix
 
+<docs-warning>This guide currently assumes you are using the [Classic Remix Compiler][classic-remix-compiler] rather than [Remix Vite][remix-vite].</docs-warning>
+
 Millions of React applications deployed worldwide are powered by [React Router][react-router]. Chances are you've shipped a few of them! Because Remix is built on top of React Router, we have worked to make migration an easy process you can work through iteratively to avoid huge refactors.
 
 If you aren't already using React Router, we think there are several compelling reasons to reconsider! History management, dynamic path matching, nested routing, and much more. Take a look at the [React Router docs][react-router-docs] and see all what we have to offer.
@@ -725,3 +727,5 @@ Now then, go off and _remix your app_. We think you'll like what you build along
 [css-side-effect-imports]: ./styling#css-side-effect-imports
 [css-bundling]: ./styling#css-bundling
 [open-graph-protocol]: https://ogp.me
+[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ../future/vite
diff --git a/docs/guides/performance.md b/docs/guides/performance.md
index 33f7f73f376..99c30c745ab 100644
--- a/docs/guides/performance.md
+++ b/docs/guides/performance.md
@@ -10,16 +10,6 @@ Instead of prescribing a precise architecture with all of its constraints like S
 
 The fastest thing to send to a user is, of course, a static document on a CDN that's close to the user. Until recently, servers pretty much only ran in one region of the world, which made for slow responses everywhere else. This is perhaps one reason SSG gained so much popularity, it allowed developers to essentially "cache" their data into HTML documents and then distribute them across the world. It comes with a lot of tradeoffs too: build times, build complexity, duplicate websites for translations, can't use it for authenticated user experiences, can't use it for very large and dynamic data sources (like our project [unpkg.com][unpkg-com]!) to name a few.
 
-## Bundle analysis
-
-Remix outputs metafiles to the server build directory (`build/` by default) so you can analyze your bundle size and composition.
-
-- `metafile.css.json` : Metafile for the CSS bundle
-- `metafile.js.json` : Metafile for the browser JS bundle
-- `metafile.server.json` : Metafile for the serve JS bundle
-
-Remix uses esbuild's metafile format so you can directly upload those files to [https://esbuild.github.io/analyze/][https-esbuild-github-io-analyze] to visualize your bundle.
-
 ## The Edge
 
 (No, not the U2 guy.)
@@ -50,6 +40,18 @@ Not only does Cloudflare run the app close to the user, they also have persisten
 
 There are other similar platforms that we've got plans to support soon.
 
+## Bundle analysis
+
+<docs-warning>This documentation is only relevant when using the [Classic Remix Compiler][classic-remix-compiler]</docs-warning>
+
+Remix outputs metafiles to the server build directory (`build/` by default) so you can analyze your bundle size and composition.
+
+- `metafile.css.json` : Metafile for the CSS bundle
+- `metafile.js.json` : Metafile for the browser JS bundle
+- `metafile.server.json` : Metafile for the serve JS bundle
+
+Remix uses esbuild's metafile format so you can directly upload those files to [https://esbuild.github.io/analyze/][https-esbuild-github-io-analyze] to visualize your bundle.
+
 ## Other Technologies
 
 Here are some other technologies to help speed up your servers:
@@ -67,3 +69,4 @@ Here are some other technologies to help speed up your servers:
 [lru-cache]: https://www.npmjs.com/package/lru-cache
 [redis]: https://www.npmjs.com/package/redis
 [https-esbuild-github-io-analyze]: https://esbuild.github.io/analyze
+[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
diff --git a/docs/guides/typescript.md b/docs/guides/typescript.md
index 97892eb9d48..e57e15e74e9 100644
--- a/docs/guides/typescript.md
+++ b/docs/guides/typescript.md
@@ -7,7 +7,7 @@ toc: false
 
 Remix seamlessly supports both JavaScript and TypeScript. If you name a file with a `.ts` or `.tsx` extension, it will treat it as TypeScript (`.tsx` is for TypeScript files [with JSX][with-jsx] in them). But it isn't required. You can write all your files as `.js` files if you don't want TypeScript.
 
-The Remix compiler will not do any type checking (it simply removes the types). If you want to do type checking, you'll want to use TypeScript's `tsc` CLI yourself. A common solution is to add a `typecheck` script to your package.json:
+The Remix CLI will not perform any type checking. Instead, you'll want to use TypeScript's `tsc` CLI yourself. A common solution is to add a `typecheck` script to your package.json:
 
 ```json filename=package.json lines=[10]
 {
@@ -15,8 +15,8 @@ The Remix compiler will not do any type checking (it simply removes the types).
   "private": true,
   "sideEffects": false,
   "scripts": {
-    "build": "remix build",
-    "dev": "remix dev --manual",
+    "build": "remix vite:build",
+    "dev": "remix vite:dev",
     "lint": "eslint --ignore-path .gitignore .",
     "start": "remix-serve ./build/index.js",
     "typecheck": "tsc"
@@ -34,7 +34,8 @@ The Remix compiler will not do any type checking (it simply removes the types).
     "@types/react": "^18.2.20",
     "@types/react-dom": "^18.2.7",
     "eslint": "^8.23.1",
-    "typescript": "^5.1.6"
+    "typescript": "^5.1.6",
+    "vite": "^5.1.4"
   },
   "engines": {
     "node": ">=18.0.0"
@@ -44,38 +45,43 @@ The Remix compiler will not do any type checking (it simply removes the types).
 
 Then you can run that script as part of continuous integration, alongside your tests.
 
-Remix has TypeScript type definitions built-in as well. The starter templates create a `remix.env.d.ts` file that is referenced by the `tsconfig.json`:
+Remix has TypeScript type definitions built-in as well. For example, the starter templates create a `tsconfig.json` file that includes the necessary types for Remix and Vite:
 
-```json filename=tsconfig.json lines=[2]
+```json filename=tsconfig.json lines=[12]
 {
-  "include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],
+  "include": [
+    "**/*.ts",
+    "**/*.tsx",
+    "**/.server/**/*.ts",
+    "**/.server/**/*.tsx",
+    "**/.client/**/*.ts",
+    "**/.client/**/*.tsx"
+  ],
   "compilerOptions": {
     "lib": ["DOM", "DOM.Iterable", "ES2022"],
+    "types": ["@remix-run/node", "vite/client"],
     "isolatedModules": true,
     "esModuleInterop": true,
     "jsx": "react-jsx",
+    "module": "ESNext",
     "moduleResolution": "Bundler",
     "resolveJsonModule": true,
     "target": "ES2022",
     "strict": true,
     "allowJs": true,
+    "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
     "baseUrl": ".",
     "paths": {
       "~/*": ["./app/*"]
     },
 
-    // Remix takes care of building everything in `remix build`.
+    // Vite takes care of building everything, not tsc.
     "noEmit": true
   }
 }
 ```
 
-```ts filename=remix.env.d.ts
-/// <reference types="@remix-run/dev" />
-/// <reference types="@remix-run/node" />
-```
-
-<docs-info>Note that the types referenced in `remix.env.d.ts` will depend on which environment you're running your app in. For example, there are different globals available in Cloudflare.</docs-info>
+<docs-info>Note that the types referenced in the `types` array will depend on which environment you're running your app in. For example, there are different globals available in Cloudflare.</docs-info>
 
 [with-jsx]: https://www.typescriptlang.org/docs/handbook/jsx.html
diff --git a/docs/index.md b/docs/index.md
index cf5c2439ebf..e7a554bcfd0 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -9,7 +9,7 @@ hidden: true
 # Remix Docs
 
 ```shellscript nonumber
-npx create-remix@latest
+npx create-remix@latest --template remix-run/remix/templates/vite
 ```
 
 <docs-cards>
diff --git a/docs/other-api/dev.md b/docs/other-api/dev.md
index 9f880dcb0de..5709f6f3cf6 100644
--- a/docs/other-api/dev.md
+++ b/docs/other-api/dev.md
@@ -14,15 +14,62 @@ To get a full list of available commands and flags, run:
 npx @remix-run/dev -h
 ```
 
-## `remix build`
+## `remix vite:build`
 
-Builds your app for production. This command will set `process.env.NODE_ENV` to `production` and minify the output for deployment.
+Builds your app for production with [Remix Vite][remix-vite]. This command will set `process.env.NODE_ENV` to `production` and minify the output for deployment.
+
+```shellscript nonumber
+remix vite:build
+```
+
+| Flag                  | Description                                             | Type                                                | Default     |
+| --------------------- | ------------------------------------------------------- | --------------------------------------------------- | ----------- |
+| `--assetsInlineLimit` | Static asset base64 inline threshold in bytes           | `number`                                            | `4096`      |
+| `--clearScreen`       | Allow/disable clear screen when logging                 | `boolean`                                           |             |
+| `--config`, `-c`      | Use specified config file                               | `string`                                            |             |
+| `--emptyOutDir`       | Force empty outDir when it's outside of root            | `boolean`                                           |             |
+| `--logLevel`, `-l`    | Use specified log level                                 | `"info" \| "warn" \| "error" \| "silent" \| string` |             |
+| `--minify`            | Enable/disable minification, or specify minifier to use | `boolean \| "terser" \| "esbuild"`                  | `"esbuild"` |
+| `--mode`, `-m`        | Set env mode                                            | `string`                                            |             |
+| `--profile`           | Start built-in Node.js inspector                        |                                                     |             |
+| `--sourcemapClient`   | Output source maps for client build                     | `boolean \| "inline" \| "hidden"`                   | `false`     |
+| `--sourcemapServer`   | Output source maps for server build                     | `boolean \| "inline" \| "hidden"`                   | `false`     |
+
+## `remix vite:dev`
+
+Runs your app in development mode with [Remix Vite][remix-vite].
+
+```shellscript nonumber
+remix vite:dev
+```
+
+| Flag               | Description                                           | Type                                                | Default |
+| ------------------ | ----------------------------------------------------- | --------------------------------------------------- | ------- |
+| `--clearScreen`    | Allow/disable clear screen when logging               | `boolean`                                           |         |
+| `--config`, `-c`   | Use specified config file                             | `string`                                            |         |
+| `--cors`           | Enable CORS                                           | `boolean`                                           |         |
+| `--force`          | Force the optimizer to ignore the cache and re-bundle | `boolean`                                           |         |
+| `--host`           | Specify hostname                                      | `string`                                            |         |
+| `--logLevel`, `-l` | Use specified log level                               | `"info" \| "warn" \| "error" \| "silent" \| string` |         |
+| `--mode`, `-m`     | Set env mode                                          | `string`                                            |         |
+| `--open`           | Open browser on startup                               | `boolean \| string`                                 |         |
+| `--port`           | Specify port                                          | `number`                                            |         |
+| `--profile`        | Start built-in Node.js inspector                      |                                                     |         |
+| `--strictPort`     | Exit if specified port is already in use              | `boolean`                                           |         |
+
+## Classic Remix Compiler Commands
+
+<docs-warning>This documentation is only relevant when using the [Classic Remix Compiler][classic-remix-compiler].</docs-warning>
+
+### `remix build`
+
+Builds your app for production with the [Classic Remix Compiler][classic-remix-compiler]. This command will set `process.env.NODE_ENV` to `production` and minify the output for deployment.
 
 ```shellscript nonumber
 remix build
 ```
 
-### Options
+#### Options
 
 | Option                                   | flag          | config | default |
 | ---------------------------------------- | ------------- | ------ | ------- |
@@ -30,7 +77,7 @@ remix build
 
 ## `remix dev`
 
-Runs the Remix compiler in watch mode and spins up your app server.
+Runs the [Classic Remix Compiler][classic-remix-compiler] in watch mode and spins up your app server.
 
 The Remix compiler will:
 
@@ -61,7 +108,7 @@ To learn more about how HMR and HDR work together, check out [Pedro's talk at Re
 
 </docs-info>
 
-### With custom app server
+#### With custom app server
 
 If you used a template to get started, hopefully it's already integrated with `remix dev` out-of-the-box.
 If not, you can follow these steps to integrate your project with `remix dev`:
@@ -112,7 +159,7 @@ If not, you can follow these steps to integrate your project with `remix dev`:
 
    </docs-info>
 
-### Options
+#### Options
 
 Options priority order is: 1. flags, 2. config, 3. defaults.
 
@@ -138,7 +185,7 @@ module.exports = {
 };
 ```
 
-### Setting a custom port
+#### Setting a custom port
 
 The `remix dev --port` option sets the internal port used for hot updates.
 **It does not affect the port your app runs on.**
@@ -155,7 +202,7 @@ remix dev -c "remix-serve --port 8000 ./build/index.js"
 In contrast, the `remix dev --port` option is an escape-hatch for users who need fine-grain control of network ports.
 Most users, should not need to use `remix dev --port`.
 
-### Manual mode
+#### Manual mode
 
 By default, `remix dev` will restart your app server whenever a rebuild occurs.
 If you'd like to keep your app server running without restarts across rebuilds, check out our [guide for manual mode][manual_mode].
@@ -165,14 +212,14 @@ You can see if app server restarts are a bottleneck for your project by comparin
 - `rebuilt (Xms)` 👉 the Remix compiler took `X` milliseconds to rebuild your app
 - `app server ready (Yms)` 👉 Remix restarted your app server, and it took `Y` milliseconds to start with the new code changes
 
-### Pick up changes from other packages
+#### Pick up changes from other packages
 
 If you are using a monorepo, you might want Remix to perform hot updates not only when your app code changes, but whenever you change code in any of your apps dependencies.
 
 For example, you could have a UI library package (`packages/ui`) that is used within your Remix app (`packages/app`).
 To pick up changes in `packages/ui`, you can configure [watchPaths][watch_paths] to include your packages.
 
-### How to set up MSW
+#### How to set up MSW
 
 To use [Mock Service Worker][msw] in development, you'll need to:
 
@@ -218,7 +265,7 @@ export const server = setupServer(
 );
 ```
 
-### How to integrate with a reverse proxy
+#### How to integrate with a reverse proxy
 
 Let's say you have the app server and Remix compiler both running on the same machine:
 
@@ -243,9 +290,9 @@ Now, hot updates will be sent correctly to the proxy:
 
 - Hot updates 👉 `https://myhost` / `wss://myhost` ✅
 
-### Performance tuning and debugging
+#### Performance tuning and debugging
 
-#### Path imports
+##### Path imports
 
 Currently, when Remix rebuilds your app, the compiler has to process your app code along with any of its dependencies.
 The compiler tree-shakes unused code from app so that you don't ship any unused code to browser and so that you keep your server as slim as possible.
@@ -263,19 +310,19 @@ For example, if you are using a library like Material UI or AntD you can likely
 In the future, Remix could pre-bundle dependencies in development to avoid this problem entirely.
 But today, you can help the compiler out by using path imports.
 
-#### Debugging bundles
+##### Debugging bundles
 
 Depending on your app and dependencies, you might be processing much more code than your app needs.
 Check out our [bundle analysis guide][bundle_analysis] for more details.
 
-### Troubleshooting
+#### Troubleshooting
 
-#### HMR
+##### HMR
 
 If you are expecting hot updates but getting full page reloads,
 check out our [discussion on Hot Module Replacement][hmr] to learn more about the limitations of React Fast Refresh and workarounds for common issues.
 
-#### HDR: every code change triggers HDR
+##### HDR: every code change triggers HDR
 
 Hot Data Revalidation detects loader changes by trying to bundle each loader and then fingerprinting the content for each.
 It relies on tree shaking to determine whether your changes affect each loader or not.
@@ -288,7 +335,7 @@ To ensure that tree shaking can reliably detect changes to loaders, make sure yo
 }
 ```
 
-#### HDR: harmless console errors when loader data is removed
+##### HDR: harmless console errors when loader data is removed
 
 When you delete a loader or remove some of the data being returned by that loader, your app should be hot updated correctly.
 But you may notice console errors logged in your browser.
@@ -300,7 +347,7 @@ But intermediate renders can sometimes use new loader data with old React compon
 We are continuing to investigate the underlying race condition to see if we can smooth that over.
 In the meantime, if those console errors bother you, you can refresh the page whenever they occur.
 
-#### HDR: performance
+##### HDR: performance
 
 When the Remix compiler builds (and rebuilds) your app, you may notice a slight slowdown as the compiler needs to crawl the dependencies for each loader.
 That way Remix can detect loader changes on rebuilds.
@@ -322,3 +369,5 @@ While the initial build slowdown is inherently a cost for HDR, we plan to optimi
 [bundle_analysis]: ../guides/performance
 [manual_mode]: ../guides/manual-mode
 [hmr]: ../discussion/hot-module-replacement
+[remix-vite]: ../future/vite
+[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
diff --git a/docs/start/future-flags.md b/docs/start/future-flags.md
index f08bd6aa435..cb4c1a14179 100644
--- a/docs/start/future-flags.md
+++ b/docs/start/future-flags.md
@@ -12,15 +12,21 @@ In our approach to software development, we aim to achieve the following goals f
 
 ## Unstable APIs and Future Flags
 
-We introduce new features into the current release with a future flag in [`remix.config.js`][remix-config] that looks something like `unstable_someFeature`.
-
-```js filename=remix.config.js
-/** @type {import('@remix-run/dev').AppConfig} */
-export default {
-  future: {
-    unstable_someFeature: true,
-  },
-};
+We introduce new features into the current release with a future flag that looks something like `unstable_someFeature`.
+
+```ts filename=vite.config.ts lines=[7-9]
+import { vitePlugin as remix } from "@remix-run/dev";
+import { defineConfig } from "vite";
+
+export default defineConfig({
+  plugins: [
+    remix({
+      future: {
+        unstable_someFeature: true,
+      },
+    }),
+  ],
+});
 ```
 
 - Once an unstable feature reaches a stable state, we remove the special prefix and include the feature in the next minor release. At this point, the API's structure remains consistent throughout subsequent minor releases.
@@ -33,13 +39,19 @@ export default {
 
 When we introduce breaking changes, we do so within the context of the current major version, and we hide them behind future flags. For instance, if we're in `v2`, a breaking change might be placed under a future flag named `v3_somethingDifferent`.
 
-```js filename=remix.config.js
-/** @type {import('@remix-run/dev').AppConfig} */
-export default {
-  future: {
-    v3_someFeature: true,
-  },
-};
+```ts filename=vite.config.ts lines=[7-9]
+import { vitePlugin as remix } from "@remix-run/dev";
+import { defineConfig } from "vite";
+
+export default defineConfig({
+  plugins: [
+    remix({
+      future: {
+        v3_someFeature: true,
+      },
+    }),
+  ],
+});
 ```
 
 - Both the existing `v2` behavior and the new `v3_somethingDifferent` behavior coexist simultaneously.
@@ -51,7 +63,6 @@ export default {
 
 Our development strategy focuses on gradual feature adoption and seamless version upgrades for major releases. This empowers developers to selectively integrate new features, avoiding the need for extensive code adjustments during version transitions. By introducing features through `unstable_*` flags, we refine the API collaboratively with early adopters while ensuring stable releases benefit from enhancements. Through careful management of breaking changes using `v3_*` flags, we provide the flexibility to adopt changes incrementally, facilitating a smoother transition between major versions. While this increases the complexity for developing Remix the framework, this developer-centric approach greatly simplifies application development with Remix, ultimately leading to improved software quality and (hopefully!) developer satisfaction.
 
-For a list of currently available Future Flags, please see the [`future`][remix-config-future] section in the `remix.config.js` documentation.
+For a list of currently available Future Flags, please see the [`future`][remix-config-future] section in the `vite.config.ts` documentation.
 
-[remix-config]: ../file-conventions/remix-config
-[remix-config-future]: ../file-conventions/remix-config#future
+[remix-config-future]: ../file-conventions/vite-config#future
diff --git a/docs/start/quickstart.md b/docs/start/quickstart.md
index 5f26acf9a55..26c7c252e7e 100644
--- a/docs/start/quickstart.md
+++ b/docs/start/quickstart.md
@@ -12,7 +12,7 @@ When you're ready to get serious about your Remix project, you might consider st
 If you prefer to initialize a batteries-included Remix project, you can use the [`create-remix` CLI][create-remix]:
 
 ```shellscript nonumber
-npx create-remix@latest
+npx create-remix@latest --template remix-run/remix/templates/vite
 ```
 
 ## Installation
@@ -28,7 +28,24 @@ npm init -y
 npm i @remix-run/node @remix-run/react @remix-run/serve isbot@4 react react-dom
 
 # install dev dependencies
-npm i -D @remix-run/dev
+npm i -D @remix-run/dev vite
+```
+
+## Vite Config
+
+```shellscript nonumber
+touch vite.config.js
+```
+
+Since Remix uses [Vite], you'll need to provide a [Vite config][vite-config] with the Remix Vite plugin. Here's the basic configuration you'll need:
+
+```js filename=vite.config.js
+import { vitePlugin as remix } from "@remix-run/dev";
+import { defineConfig } from "vite";
+
+export default defineConfig({
+  plugins: [remix()],
+});
 ```
 
 ## The Root Route
@@ -75,10 +92,10 @@ export default function App() {
 First build the app for production:
 
 ```shellscript nonumber
-npx remix build
+npx remix vite:build
 ```
 
-You should now see a `build/` folder (the server version of your app) and `public/build` folder (the browser version) with some build artifacts in them. (This is all [configurable][remix_config].)
+You should now see a `build` folder containing a `server` folder (the server version of your app) and a `client` folder (the browser version) with some build artifacts in them. (This is all [configurable][remix_config].)
 
 👉 **Run the app with `remix-serve`**
 
@@ -95,7 +112,7 @@ Now you can run your app with `remix-serve`:
 
 ```shellscript nonumber
 # note the dash!
-npx remix-serve build/index.js
+npx remix-serve build/server/index.js
 ```
 
 You should be able to open up [http://localhost:3000][http-localhost-3000] and see the "hello world" page.
@@ -106,20 +123,21 @@ Aside from the unholy amount of code in `node_modules`, our Remix app is just on
 ├── app/
 │   └── root.jsx
 └── package.json
+└── vite.config.js
 ```
 
 ## Bring Your Own Server
 
-The `build/` directory created by `remix build` is just a module that you run inside a server like Express, Cloudflare Workers, Netlify, Vercel, Fastly, AWS, Deno, Azure, Fastify, Firebase, ... anywhere.
+The `build/server` directory created by `remix vite:build` is just a module that you run inside a server like Express, Cloudflare Workers, Netlify, Vercel, Fastly, AWS, Deno, Azure, Fastify, Firebase, ... anywhere.
 
 If you don't care to set up your own server, you can use `remix-serve`. It's a simple express-based server maintained by the Remix team. However, Remix is specifically designed to run in _any_ JavaScript environment so that you own your stack. It is expected many —if not most— production apps will have their own server. You can read more about this in [Runtimes, Adapters, and Stacks][runtimes].
 
 Just for kicks, let's stop using `remix-serve` and use express instead.
 
-👉 **Install Express and the Remix Express adapter**
+👉 **Install Express, the Remix Express adapter, and [cross-env] for running in production mode**
 
 ```shellscript nonumber
-npm i express @remix-run/express
+npm i express @remix-run/express cross-env
 
 # not going to use this anymore
 npm uninstall @remix-run/serve
@@ -128,18 +146,18 @@ npm uninstall @remix-run/serve
 👉 **Create an Express server**
 
 ```shellscript nonumber
-touch server.mjs
+touch server.js
 ```
 
-```js filename=server.mjs
+```js filename=server.js
 import { createRequestHandler } from "@remix-run/express";
 import express from "express";
 
-// notice that the result of `remix build` is "just a module"
-import * as build from "./build/index.js";
+// notice that the result of `remix vite:build` is "just a module"
+import * as build from "./build/server/index.js";
 
 const app = express();
-app.use(express.static("public"));
+app.use(express.static("build/client"));
 
 // and your app is "just a request handler"
 app.all("*", createRequestHandler({ build }));
@@ -152,94 +170,71 @@ app.listen(3000, () => {
 👉 **Run your app with express**
 
 ```shellscript nonumber
-node server.mjs
+node server.js
 ```
 
 Now that you own your server, you can debug your app with whatever tooling your server has. For example, you can inspect your app with chrome devtools with the [Node.js inspect flag][inspect]:
 
 ```shellscript nonumber
-node --inspect server.mjs
+node --inspect server.js
 ```
 
 ## Development Workflow
 
-Instead of stopping, rebuilding, and starting your server all the time, you can run Remix in development. This enables instant feedback to changes in your app with React Refresh (Hot Module Replacement) and Remix Hot Data Revalidation.
+Instead of stopping, rebuilding, and starting your server all the time, you can run Remix in development using [Vite in middleware mode][vite-middleware]. This enables instant feedback to changes in your app with React Refresh (Hot Module Replacement) and Remix Hot Data Revalidation.
 
-First add a dev command in `package.json` that will run `remix dev`:
+First, as a convenience, add `dev` and `start` commands in `package.json` that will run your server in development and production modes respectively:
 
 👉 **Add a "scripts" entry to `package.json`**
 
 ```jsonc filename=package.json lines=[2-4] nocopy
 {
   "scripts": {
-    "dev": "remix dev -c \"node server.mjs\""
+    "dev": "node ./server.js",
+    "start": "cross-env NODE_ENV=production node ./server.js"
   }
   // ...
 }
 ```
 
-This will start the Remix development server which will watch your files for changes and rebuild your app. The `-c` flag tells it how to start your actual application server.
+👉 **Add Vite development middleware to your server**
 
-When files change, Remix will restart your server for you, but because you own your server, you also have to tell Remix when it has restarted so Remix can safely send the hot updates to the browser.
+Vite middleware not applied if `process.env.NODE_ENV` is set to `"production"`, in which case you'll still be running the regular build output as you did earlier.
 
-👉 **Add `broadcastDevReady` to your server**
-
-```js filename=server.mjs lines=[2,15-17]
+```js filename=server.js lines=[4-11,14-18,20-25]
 import { createRequestHandler } from "@remix-run/express";
-import { broadcastDevReady } from "@remix-run/node";
 import express from "express";
 
-// notice that the result of `remix build` is "just a module"
-import * as build from "./build/index.js";
+const viteDevServer =
+  process.env.NODE_ENV === "production"
+    ? null
+    : await import("vite").then((vite) =>
+        vite.createServer({
+          server: { middlewareMode: true },
+        })
+      );
 
 const app = express();
-app.use(express.static("public"));
+app.use(
+  viteDevServer
+    ? viteDevServer.middlewares
+    : express.static("build/client")
+);
+
+const build = viteDevServer
+  ? () =>
+      viteDevServer.ssrLoadModule(
+        "virtual:remix/server-build"
+      )
+  : await import("./build/server/index.js");
 
-// and your app is "just a request handler"
 app.all("*", createRequestHandler({ build }));
 
 app.listen(3000, () => {
-  if (process.env.NODE_ENV === "development") {
-    broadcastDevReady(build);
-  }
   console.log("App listening on http://localhost:3000");
 });
 ```
 
-And finally, let's connect your UI in the browser to receive those broadcasts:
-
-```jsx filename=app/root.jsx lines=[3,25]
-import {
-  Links,
-  LiveReload,
-  Meta,
-  Outlet,
-  Scripts,
-} from "@remix-run/react";
-
-export default function App() {
-  return (
-    <html>
-      <head>
-        <link
-          rel="icon"
-          href="data:image/x-icon;base64,AA"
-        />
-        <Meta />
-        <Links />
-      </head>
-      <body>
-        <h1>Hello world!</h1>
-        <Outlet />
-
-        <Scripts />
-        <LiveReload />
-      </body>
-    </html>
-  );
-}
-```
-
 👉 **Start the dev server**
 
 ```shellscript nonumber
@@ -265,7 +260,7 @@ Entry file entry.server created at app/entry.server.tsx.
 
 Congrats, you can add Remix to your resume! Summing things up, we've learned:
 
-- `remix build` and `remix dev` compile your app into two things:
+- Remix compiles your app into two things:
   - A request handler that you add to your own JavaScript server
   - A pile of static assets in your public directory for the browser
 - You can bring your own server with adapters to deploy anywhere
@@ -285,3 +280,7 @@ What's next?
 [templates]: /resources?category=templates
 [http-localhost-3000]: http://localhost:3000
 [es-modules]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Modules
+[vite]: https://vitejs.dev
+[vite-config]: https://vitejs.dev/config
+[vite-middleware]: https://vitejs.dev/guide/ssr#setting-up-the-dev-server
+[cross-env]: https://www.npmjs.com/package/cross-env
diff --git a/docs/start/tutorial.md b/docs/start/tutorial.md
index 057de8579bd..2e88fa03cc5 100644
--- a/docs/start/tutorial.md
+++ b/docs/start/tutorial.md
@@ -36,7 +36,7 @@ npm install
 npm run dev
 ```
 
-You should be able to open up [http://localhost:3000][http-localhost-3000] and see an unstyled screen that looks like this:
+You should be able to open up [http://localhost:5173][http-localhost-5173] and see an unstyled screen that looks like this:
 
 <img class="tutorial" src="/docs-images/contacts/03.webp" />
 
@@ -52,7 +52,6 @@ Note the file at `app/root.tsx`. This is what we call the "Root Route". It's the
 import {
   Form,
   Links,
-  LiveReload,
   Meta,
   Scripts,
   ScrollRestoration,
@@ -106,7 +105,6 @@ export default function App() {
 
         <ScrollRestoration />
         <Scripts />
-        <LiveReload />
       </body>
     </html>
   );
@@ -119,7 +117,7 @@ export default function App() {
 
 While there are multiple ways to style your Remix app, we're going to use a plain stylesheet that's already been written to keep things focused on Remix.
 
-You can import CSS files directly into JavaScript modules. The compiler will fingerprint the asset, save it to your [`assetsBuildDirectory`][assets-build-directory], and provide your module with the publicly accessible href.
+You can import CSS files directly into JavaScript modules. Vite will fingerprint the asset, save it to your build's client directory, and provide your module with the publicly accessible href.
 
 👉 **Import the app styles**
 
@@ -127,7 +125,7 @@ You can import CSS files directly into JavaScript modules. The compiler will fin
 import type { LinksFunction } from "@remix-run/node";
 // existing imports
 
-import appStylesHref from "./app.css";
+import appStylesHref from "./app.css?url";
 
 export const links: LinksFunction = () => [
   { rel: "stylesheet", href: appStylesHref },
@@ -268,12 +266,11 @@ Since Remix is built on top of React Router, it supports nested routing. In orde
 
 👉 **Render an [`<Outlet />`][outlet-component]**
 
-```tsx filename=app/root.tsx lines=[7,20-22]
+```tsx filename=app/root.tsx lines=[6,19-21]
 // existing imports
 import {
   Form,
   Links,
-  LiveReload,
   Meta,
   Outlet,
   Scripts,
@@ -310,13 +307,12 @@ Client side routing allows our app to update the URL without requesting another
 
 👉 **Change the sidebar `<a href>` to `<Link to>`**
 
-```tsx filename=app/root.tsx lines=[4,25,28]
+```tsx filename=app/root.tsx lines=[4,24,27]
 // existing imports
 import {
   Form,
   Link,
   Links,
-  LiveReload,
   Meta,
   Outlet,
   Scripts,
@@ -369,14 +365,13 @@ There are two APIs we'll be using to load data, [`loader`][loader] and [`useLoad
 
 <docs-info>The following code has a type error in it, we'll fix it in the next section</docs-info>
 
-```tsx filename=app/root.tsx lines=[2,12,16,20-23,26,35-58]
+```tsx filename=app/root.tsx lines=[2,11,15,19-22,25,34-57]
 // existing imports
 import { json } from "@remix-run/node";
 import {
   Form,
   Link,
   Links,
-  LiveReload,
   Meta,
   Outlet,
   Scripts,
@@ -821,12 +816,11 @@ Now that we have a bunch of records, it's not clear which one we're looking at i
 
 👉 **Replace `<Link>` with `<NavLink>` in the sidebar**
 
-```tsx filename=app/root.tsx lines=[7,28-37,39]
+```tsx filename=app/root.tsx lines=[6,27-36,38]
 // existing imports
 import {
   Form,
   Links,
-  LiveReload,
   Meta,
   NavLink,
   Outlet,
@@ -885,12 +879,11 @@ Remix is managing all the state behind the scenes and reveals the pieces you nee
 
 👉 **Use `useNavigation` to add global pending UI**
 
-```tsx filename=app/root.tsx lines=[12,19,27-29]
+```tsx filename=app/root.tsx lines=[11,18,26-28]
 // existing imports
 import {
   Form,
   Links,
-  LiveReload,
   Meta,
   NavLink,
   Outlet,
@@ -1089,7 +1082,7 @@ Let's see what happens when we submit the search form:
 Note the browser's URL now contains your query in the URL as [`URLSearchParams`][url-search-params]:
 
 ```
-http://localhost:3000/?q=ryan
+http://localhost:5173/?q=ryan
 ```
 
 Since it's not `<Form method="post">`, Remix emulates the browser by serializing the [`FormData`][form-data] into the [`URLSearchParams`][url-search-params] instead of the request body.
@@ -1279,12 +1272,11 @@ We've got a product decision to make here. Sometimes you want the user to submit
 
 We've seen `useNavigate` already, we'll use its cousin, [`useSubmit`][use-submit], for this.
 
-```tsx filename=app/root.tsx lines=[13,20,33-35]
+```tsx filename=app/root.tsx lines=[12,19,32-34]
 // existing imports
 import {
   Form,
   Links,
-  LiveReload,
   Meta,
   NavLink,
   Outlet,
@@ -1645,5 +1637,5 @@ That's it! Thanks for giving Remix a shot. We hope this tutorial gives you a sol
 [links]: ../route/links
 [routes-file-conventions]: ../file-conventions/routes
 [quickstart]: ./quickstart
-[http-localhost-3000]: http://localhost:3000
+[http-localhost-5173]: http://localhost:5173
 [fetch]: https://developer.mozilla.org/en-US/docs/Web/API/fetch
diff --git a/docs/start/v2.md b/docs/start/v2.md
index 784a561aef9..95dc0af306a 100644
--- a/docs/start/v2.md
+++ b/docs/start/v2.md
@@ -5,6 +5,8 @@ order: 3
 
 # Upgrading to v2
 
+<docs-warning>This documentation provides guidance on migrating from v1 to v2 while using the [Classic Remix compiler][classic-remix-compiler]. For additional guidance on migrating to Vite, refer to the [Remix Vite documentation][remix-vite].</docs-warning>
+
 All v2 APIs and behaviors are available in v1 with [Future Flags][future-flags]. They can be enabled one at a time to avoid development disruption of your project. After you have enabled all flags, upgrading to v2 should be a non-breaking upgrade.
 
 If you're having trouble see the [Troubleshooting][troubleshooting] section.
@@ -1108,6 +1110,8 @@ module.exports = {
 
 Please see the [`serverModuleFormat`][server-module-format] section.
 
+[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ../future/vite
 [future-flags]: ./future-flags
 [remix_config]: ../file-conventions/remix-config
 [pass_through_class]: https://nodejs.org/api/stream.html#class-streampassthrough
diff --git a/docs/styling/bundling.md b/docs/styling/bundling.md
index cb9ccc3a5ab..e695de54cb5 100644
--- a/docs/styling/bundling.md
+++ b/docs/styling/bundling.md
@@ -4,6 +4,8 @@ title: CSS Bundling
 
 # CSS Bundling
 
+<docs-warning>This documentation is only relevant when using the [Classic Remix Compiler][classic-remix-compiler]. If you're using [Remix Vite][remix-vite], you should refer to [Vite's CSS documentation][vite-css] instead.</docs-warning>
+
 Some CSS features in Remix bundle styles into a single file that you load manually into the application including:
 
 - [CSS Side Effect Imports][css-side-effect-imports]
@@ -47,3 +49,6 @@ Avoid using `export *` due to an [issue with `esbuild`'s CSS tree shaking][esbui
 [css-modules]: ./css-modules
 [vanilla-extract]: ./vanilla-extract
 [regular-stylesheet-imports]: ./css
+[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ../future/vite
+[vite-css]: https://vitejs.dev/guide/features#css
diff --git a/docs/styling/css-imports.md b/docs/styling/css-imports.md
index 68e6e8ee787..4c0cf49c94a 100644
--- a/docs/styling/css-imports.md
+++ b/docs/styling/css-imports.md
@@ -4,6 +4,8 @@ title: CSS Imports
 
 # CSS Side Effect Imports
 
+<docs-warning>This documentation is no longer relevant when using [Remix Vite][remix-vite]. CSS side effect imports work out of the box in Vite.</docs-warning>
+
 Some NPM packages use side effect imports of plain CSS files (e.g. `import "./styles.css"`) to declare the CSS dependencies of JavaScript files. If you want to consume one of these packages, first ensure you've set up [CSS bundling][css-bundling] in your application.
 
 For example, a module may have source code like this:
@@ -32,3 +34,4 @@ module.exports = {
 
 [css-bundling]: ./bundling
 [server-dependencies-to-bundle]: ../file-conventions/remix-config#serverdependenciestobundle
+[remix-vite]: ../future/vite
diff --git a/docs/styling/css-modules.md b/docs/styling/css-modules.md
index ae1e36e703f..8003688da76 100644
--- a/docs/styling/css-modules.md
+++ b/docs/styling/css-modules.md
@@ -4,6 +4,8 @@ title: CSS Modules
 
 # CSS Modules
 
+<docs-warning>This documentation is only relevant when using the [Classic Remix Compiler][classic-remix-compiler]. If you're using [Remix Vite][remix-vite], support for [CSS Modules is built into Vite][vite-css-modules].</docs-warning>
+
 To use the built-in CSS Modules support, first ensure you've set up [CSS bundling][css-bundling] in your application.
 
 You can then opt into [CSS Modules][css-modules] via the `.module.css` file name convention. For example:
@@ -35,3 +37,6 @@ Button.displayName = "Button";
 
 [css-bundling]: ./bundling
 [css-modules]: https://github.com/css-modules/css-modules
+[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ../future/vite
+[vite-css-modules]: https://vitejs.dev/guide/features#css-modules
diff --git a/docs/styling/css.md b/docs/styling/css.md
index a6b5b7ea497..494f8f96a10 100644
--- a/docs/styling/css.md
+++ b/docs/styling/css.md
@@ -14,6 +14,8 @@ CSS Maintenance issues can creep into a web app for a few reasons. It can get di
 
 Remix alleviates these issues with route-based stylesheets. Nested routes can each add their own stylesheets to the page and Remix will automatically prefetch, load, and unload them with the route. When the scope of concern is limited to just the active routes, the risks of these problems are reduced significantly. The only chances for conflicts are with the parent routes' styles (and even then, you will likely see the conflict since the parent route is also rendering).
 
+<docs-warning>If you're using the [Classic Remix Compiler][classic-remix-compiler] rather than [Remix Vite][remix-vite], you should remove `?url` from the end of your CSS import paths.</docs-warning>
+
 ### Route Styles
 
 Each route can add style links to the page, for example:
@@ -21,7 +23,7 @@ Each route can add style links to the page, for example:
 ```tsx filename=app/routes/dashboard.tsx
 import type { LinksFunction } from "@remix-run/node"; // or cloudflare/deno
 
-import styles from "~/styles/dashboard.css";
+import styles from "~/styles/dashboard.css?url";
 
 export const links: LinksFunction = () => [
   { rel: "stylesheet", href: styles },
@@ -31,7 +33,7 @@ export const links: LinksFunction = () => [
 ```tsx filename=app/routes/dashboard.accounts.tsx
 import type { LinksFunction } from "@remix-run/node"; // or cloudflare/deno
 
-import styles from "~/styles/accounts.css";
+import styles from "~/styles/accounts.css?url";
 
 export const links: LinksFunction = () => [
   { rel: "stylesheet", href: styles },
@@ -41,7 +43,7 @@ export const links: LinksFunction = () => [
 ```tsx filename=app/routes/dashboard.sales.tsx
 import type { LinksFunction } from "@remix-run/node"; // or cloudflare/deno
 
-import styles from "~/styles/sales.css";
+import styles from "~/styles/sales.css?url";
 
 export const links: LinksFunction = () => [
   { rel: "stylesheet", href: styles },
@@ -116,7 +118,7 @@ Note that these are not routes, but they export `links` functions as if they wer
 ```tsx filename=app/components/button/index.tsx lines=[1,3,5-7]
 import type { LinksFunction } from "@remix-run/node"; // or cloudflare/deno
 
-import styles from "./styles.css";
+import styles from "./styles.css?url";
 
 export const links: LinksFunction = () => [
   { rel: "stylesheet", href: styles },
@@ -144,7 +146,7 @@ import type { LinksFunction } from "@remix-run/node"; // or cloudflare/deno
 
 import { Button, links as buttonLinks } from "../button";
 
-import styles from "./styles.css";
+import styles from "./styles.css?url";
 
 export const links: LinksFunction = () => [
   ...buttonLinks(),
@@ -174,7 +176,7 @@ import {
   PrimaryButton,
   links as primaryButtonLinks,
 } from "~/components/primary-button";
-import styles from "~/styles/index.css";
+import styles from "~/styles/index.css?url";
 
 export const links: LinksFunction = () => [
   ...primaryButtonLinks(),
@@ -193,7 +195,7 @@ import { AddFavoriteButton } from "~/components/add-favorite-button";
 import { ProductDetails } from "~/components/product-details";
 import { ProductTile } from "~/components/product-tile";
 import { TileGrid } from "~/components/tile-grid";
-import styles from "~/styles/$category.css";
+import styles from "~/styles/$category.css?url";
 
 export const links: LinksFunction = () => [
   { rel: "stylesheet", href: styles },
@@ -235,7 +237,7 @@ import {
   TileGrid,
   links as tileGridLinks,
 } from "~/components/tile-grid";
-import styles from "~/styles/$category.css";
+import styles from "~/styles/$category.css?url";
 
 export const links: LinksFunction = () => {
   return [
@@ -273,7 +275,7 @@ Since these are just `<link>` tags, you can do more than stylesheet links, like
 ```tsx filename=app/components/copy-to-clipboard.tsx lines=[6-11]
 import type { LinksFunction } from "@remix-run/node"; // or cloudflare/deno
 
-import styles from "./styles.css";
+import styles from "./styles.css?url";
 
 export const links: LinksFunction = () => [
   {
@@ -330,3 +332,5 @@ export const links: LinksFunction = () => {
 [links]: ../route/links
 [custom-properties]: https://developer.mozilla.org/en-US/docs/Web/CSS/--*
 [link]: ../components/link
+[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ../future/vite
diff --git a/docs/styling/postcss.md b/docs/styling/postcss.md
index 8377e404d95..3d3e7e08e9b 100644
--- a/docs/styling/postcss.md
+++ b/docs/styling/postcss.md
@@ -4,6 +4,8 @@ title: PostCSS
 
 # PostCSS
 
+<docs-warning>This documentation is only relevant when using the [Classic Remix Compiler][classic-remix-compiler]. If you're using [Remix Vite][remix-vite], support for [PostCSS is built into Vite][vite-postcss].</docs-warning>
+
 [PostCSS][postcss] is a popular tool with a rich plugin ecosystem, commonly used to prefix CSS for older browsers, transpile future CSS syntax, inline images, lint your styles and more. When a PostCSS config is detected, Remix will automatically run PostCSS across all CSS in your project.
 
 For example, to use [Autoprefixer][autoprefixer], first install the PostCSS plugin.
@@ -103,3 +105,6 @@ An example using SASS.
 [css-bundling]: ./bundling
 [postcss-preset-env]: https://preset-env.cssdb.org
 [esbuild-css-tree-shaking-issue]: https://github.com/evanw/esbuild/issues/1370
+[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ../future/vite
+[vite-postcss]: https://vitejs.dev/guide/features#postcss
diff --git a/docs/styling/tailwind.md b/docs/styling/tailwind.md
index 0aa93a4d65d..fb0475f3ccb 100644
--- a/docs/styling/tailwind.md
+++ b/docs/styling/tailwind.md
@@ -4,9 +4,11 @@ title: Tailwind
 
 # Tailwind
 
+<docs-warning>This documentation is only relevant when using the [Classic Remix Compiler][classic-remix-compiler]. If you're using [Remix Vite][remix-vite], Tailwind can be integrated using [Vite's built-in PostCSS support][vite-postcss].</docs-warning>
+
 Perhaps the most popular way to style a Remix application in the community is to use [Tailwind CSS][tailwind].
 
-Remix supports tailwind automatically if `tailwind.config.js` is present in the root of your project. You can disable it in [Remix Config][remix_config]
+Remix supports Tailwind automatically if `tailwind.config.js` is present in the root of your project. You can disable it in [Remix Config][remix_config]
 
 Tailwind has the benefits of inline-style co-location for developer ergonomics and is able to generate a CSS file for Remix to import. The generated CSS file generally caps out to a reasonable size, even for large applications. Load that file into the `app/root.tsx` links and be done with it.
 
@@ -81,3 +83,6 @@ Alternatively, you can use [PostCSS][built-in-post-css-support] with the [postcs
 [built-in-post-css-support]: ./postcss
 [tailwind-intelli-sense-extension]: https://marketplace.visualstudio.com/items?itemName=bradlc.vscode-tailwindcss
 [postcss-import]: https://github.com/postcss/postcss-import
+[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ../future/vite
+[vite-postcss]: https://vitejs.dev/guide/features#postcss
diff --git a/docs/styling/vanilla-extract.md b/docs/styling/vanilla-extract.md
index 59e8861229f..f28a50609d8 100644
--- a/docs/styling/vanilla-extract.md
+++ b/docs/styling/vanilla-extract.md
@@ -4,6 +4,8 @@ title: Vanilla Extract
 
 # Vanilla Extract
 
+<docs-warning>This documentation is only relevant when using the [Classic Remix Compiler][classic-remix-compiler]. If you're using [Remix Vite][remix-vite], Vanilla Extract can be integrated using the [Vanilla Extract Vite plugin][vanilla-extract-vite].</docs-warning>
+
 [Vanilla Extract][vanilla-extract] is a zero-runtime CSS-in-TypeScript (or JavaScript) library that lets you use TypeScript as your CSS preprocessor. Styles are written in separate `*.css.ts` (or `*.css.js`) files and all code within them is executed during the build process rather than in your user's browser. If you want to keep your CSS bundle size to a minimum, Vanilla Extract also provides an official library called [Sprinkles][sprinkles] that lets you define a custom set of utility classes and a type-safe function for accessing them at runtime.
 
 To use the built-in Vanilla Extract support, first ensure you've set up [CSS bundling][css-bundling] in your application.
@@ -46,3 +48,6 @@ Button.displayName = "Button";
 [vanilla-extract]: https://vanilla-extract.style
 [sprinkles]: https://vanilla-extract.style/documentation/packages/sprinkles
 [css-bundling]: ./bundling
+[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ../future/vite
+[vanilla-extract-vite]: https://vanilla-extract.style/documentation/integrations/vite
diff --git a/docs/tutorials/jokes.md b/docs/tutorials/jokes.md
index e9144c0bec9..8c38a8dee03 100644
--- a/docs/tutorials/jokes.md
+++ b/docs/tutorials/jokes.md
@@ -6,6 +6,8 @@ hidden: true
 
 # Jokes App Tutorial
 
+<docs-warning>This tutorial currently assumes you are using the[Classic Remix Compiler][classic-remix-compiler] rather than [Remix Vite][remix-vite].</docs-warning>
+
 You want to learn Remix? You're in the right place. Let's build [Remix Jokes][remix-jokes]!
 
 <docs-info><a target="_blank" rel="noopener noreferrer" href="https://www.youtube.com/watch?v=hsIWJpuxNj0">Work through this tutorial with Kent in this live stream</a></docs-info>
@@ -7782,6 +7784,8 @@ Any time you make a change, simply run `fly deploy` again to redeploy.
 
 Phew! And there we have it. If you made it through this whole thing then I'm really impressed ([tweet your success][tweet-your-success])! There's a lot to Remix, and we've only gotten you started. Good luck on the rest of your Remix journey!
 
+[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ../future/vite
 [remix-jokes]: https://remix-jokes.lol
 [mdn]: https://developer.mozilla.org/en-US
 [prisma]: https://www.prisma.io
diff --git a/templates/remix-tutorial/.eslintrc.js b/templates/remix-tutorial/.eslintrc.cjs
similarity index 100%
rename from templates/remix-tutorial/.eslintrc.js
rename to templates/remix-tutorial/.eslintrc.cjs
diff --git a/templates/remix-tutorial/.gitignore b/templates/remix-tutorial/.gitignore
index 3f7bf98da3e..80ec311f4ff 100644
--- a/templates/remix-tutorial/.gitignore
+++ b/templates/remix-tutorial/.gitignore
@@ -2,5 +2,4 @@ node_modules
 
 /.cache
 /build
-/public/build
 .env
diff --git a/templates/remix-tutorial/README.md b/templates/remix-tutorial/README.md
index da8d02ad77c..c0fd24f3cbb 100644
--- a/templates/remix-tutorial/README.md
+++ b/templates/remix-tutorial/README.md
@@ -34,5 +34,5 @@ If you're familiar with deploying node applications, the built-in Remix app serv
 
 Make sure to deploy the output of `remix build`
 
-- `build/`
-- `public/build/`
+- `build/server`
+- `build/client`
diff --git a/templates/remix-tutorial/app/root.tsx b/templates/remix-tutorial/app/root.tsx
index 0ea98aded31..4b8891e7265 100644
--- a/templates/remix-tutorial/app/root.tsx
+++ b/templates/remix-tutorial/app/root.tsx
@@ -1,7 +1,6 @@
 import {
   Form,
   Links,
-  LiveReload,
   Meta,
   Scripts,
   ScrollRestoration,
@@ -48,7 +47,6 @@ export default function App() {
 
         <ScrollRestoration />
         <Scripts />
-        <LiveReload />
       </body>
     </html>
   );
diff --git a/templates/remix-tutorial/package.json b/templates/remix-tutorial/package.json
index 428f9bd16a9..cc4f24a52fa 100644
--- a/templates/remix-tutorial/package.json
+++ b/templates/remix-tutorial/package.json
@@ -1,11 +1,12 @@
 {
   "private": true,
   "sideEffects": false,
+  "type": "module",
   "scripts": {
-    "build": "remix build",
-    "dev": "remix dev --manual",
+    "build": "remix vite:build",
+    "dev": "remix vite:dev",
     "lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
-    "start": "remix-serve build",
+    "start": "remix-serve build/server/index.js",
     "typecheck": "tsc"
   },
   "dependencies": {
@@ -20,7 +21,7 @@
     "tiny-invariant": "^1.3.1"
   },
   "devDependencies": {
-    "@remix-run/dev": "^2.3.1",
+    "@remix-run/dev": "*",
     "@types/react": "^18.2.20",
     "@types/react-dom": "^18.2.7",
     "@typescript-eslint/eslint-plugin": "^6.13.0",
@@ -31,7 +32,9 @@
     "eslint-plugin-jsx-a11y": "^6.8.0",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "typescript": "^5.1.6"
+    "typescript": "^5.1.6",
+    "vite": "^5.1.4",
+    "vite-tsconfig-paths": "^4.3.1"
   },
   "engines": {
     "node": ">=18.0.0"
diff --git a/templates/remix-tutorial/remix.config.js b/templates/remix-tutorial/remix.config.js
deleted file mode 100644
index 7617abd6153..00000000000
--- a/templates/remix-tutorial/remix.config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/** @type {import('@remix-run/dev').AppConfig} */
-module.exports = {
-  ignoredRouteFiles: ["**/*.css"],
-  serverModuleFormat: "cjs",
-};
diff --git a/templates/remix-tutorial/remix.env.d.ts b/templates/remix-tutorial/remix.env.d.ts
deleted file mode 100644
index dcf8c45e1d4..00000000000
--- a/templates/remix-tutorial/remix.env.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-/// <reference types="@remix-run/dev" />
-/// <reference types="@remix-run/node" />
diff --git a/templates/remix-tutorial/tsconfig.json b/templates/remix-tutorial/tsconfig.json
index 7edc18b084a..d0632f13fcc 100644
--- a/templates/remix-tutorial/tsconfig.json
+++ b/templates/remix-tutorial/tsconfig.json
@@ -1,7 +1,15 @@
 {
-  "include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],
+  "include": [
+    "**/*.ts",
+    "**/*.tsx",
+    "**/.server/**/*.ts",
+    "**/.server/**/*.tsx",
+    "**/.client/**/*.ts",
+    "**/.client/**/*.tsx"
+  ],
   "compilerOptions": {
     "lib": ["DOM", "DOM.Iterable", "ES2022"],
+    "types": ["@remix-run/node", "vite/client"],
     "isolatedModules": true,
     "esModuleInterop": true,
     "jsx": "react-jsx",
diff --git a/templates/remix-tutorial/vite.config.ts b/templates/remix-tutorial/vite.config.ts
new file mode 100644
index 00000000000..a747eeb4a18
--- /dev/null
+++ b/templates/remix-tutorial/vite.config.ts
@@ -0,0 +1,15 @@
+import { vitePlugin as remix } from "@remix-run/dev";
+import { installGlobals } from "@remix-run/node";
+import { defineConfig } from "vite";
+import tsconfigPaths from "vite-tsconfig-paths";
+
+installGlobals();
+
+export default defineConfig({
+  plugins: [
+    remix({
+      ignoredRouteFiles: ["**/*.css"],
+    }),
+    tsconfigPaths(),
+  ],
+});

From 4a23e6e3a861238ea5ad285c7d436102bdd43564 Mon Sep 17 00:00:00 2001
From: Deanmv <deanvizer@me.com>
Date: Mon, 11 Mar 2024 13:42:31 +0000
Subject: [PATCH 008/108] docs(future/vite): Fix links (#9031)

---
 docs/future/vite.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/future/vite.md b/docs/future/vite.md
index 10201267dfd..89b7eeca83b 100644
--- a/docs/future/vite.md
+++ b/docs/future/vite.md
@@ -1094,7 +1094,7 @@ Finally, we were inspired by how other frameworks implemented Vite support:
 [template-vite-cloudflare]: https://github.com/remix-run/remix/tree/main/templates/vite-cloudflare
 [public-path]: ../file-conventions/remix-config#publicpath
 [server-build-path]: ../file-conventions/remix-config#serverbuildpath
-[vite-config]: ../file-conventions/vite-config.md
+[vite-config]: ../file-conventions/vite-config
 [vite-plugins]: https://vitejs.dev/plugins
 [vite-features]: https://vitejs.dev/guide/features
 [supported-remix-config-options]: #configuration
@@ -1141,7 +1141,6 @@ Finally, we were inspired by how other frameworks implemented Vite support:
 [rollup-plugin-visualizer]: https://github.com/btd/rollup-plugin-visualizer
 [debugging]: #debugging
 [performance]: #performance
-[server-vs-client]: ../discussion/server-vs-client.md
 [vite-env-only]: https://github.com/pcattori/vite-env-only
 [explicitly-isolate-server-only-code]: #splitting-up-client-and-server-code
 [route-component]: ../route/component
@@ -1169,4 +1168,4 @@ Finally, we were inspired by how other frameworks implemented Vite support:
 [presets]: ./presets
 [fix-up-css-imports-referenced-in-links]: #fix-up-css-imports-referenced-in-links
 [vite-plugin-react]: https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-react
-[splitting-up-client-and-server-code]: ../discussion/server-vs-client.md
+[splitting-up-client-and-server-code]: ../discussion/server-vs-client

From 0007a63593de3e5c67d3ee2daf0fb7f5dca0cd97 Mon Sep 17 00:00:00 2001
From: David Cramer <dcramer@users.noreply.github.com>
Date: Wed, 13 Mar 2024 06:05:13 -0700
Subject: [PATCH 009/108] docs(future/vite): fix grammar (#9036)

---
 contributors.yml    | 1 +
 docs/future/vite.md | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/contributors.yml b/contributors.yml
index a45aab8d936..e450de030aa 100644
--- a/contributors.yml
+++ b/contributors.yml
@@ -131,6 +131,7 @@
 - davecranwell-vocovo
 - DavidHollins6
 - davongit
+- dcramer
 - Deanmv
 - defjosiah
 - denissb
diff --git a/docs/future/vite.md b/docs/future/vite.md
index 89b7eeca83b..889a98ce06c 100644
--- a/docs/future/vite.md
+++ b/docs/future/vite.md
@@ -199,7 +199,7 @@ This also means that the following configuration defaults have been changed:
 - [publicPath][public-path] has been replaced by [Vite's "base" option][vite-base] which defaults to `"/"` rather than `"/build/"`.
 - [serverBuildPath][server-build-path] has been replaced by `serverBuildFile` which defaults to `"index.js"`. This file will be written into the server directory within your configured `buildDirectory`.
 
-One of the reasons that Remix is moving to Vite is, so you have less to learn when adopting Remix.
+One of the reasons that Remix is moving to Vite is so you have less to learn when adopting Remix.
 This means that, for any additional bundling features you'd like to use, you should reference [Vite documentation][vite] and the [Vite plugin community][vite-plugins] rather than the Remix documentation.
 
 Vite has many [features][vite-features] and [plugins][vite-plugins] that are not built into the existing Remix compiler.

From a14d33f8d0532d71a5c01a644639263d2d8fcac3 Mon Sep 17 00:00:00 2001
From: Sudhanshu <perfectsudh@gmail.com>
Date: Wed, 13 Mar 2024 18:48:59 +0530
Subject: [PATCH 010/108] docs(guides/migrating-react-router-app): update repo
 link (#9045)

---
 contributors.yml                          | 1 +
 docs/guides/migrating-react-router-app.md | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/contributors.yml b/contributors.yml
index e450de030aa..ebfc75288cf 100644
--- a/contributors.yml
+++ b/contributors.yml
@@ -665,3 +665,4 @@
 - zainfathoni
 - zayenz
 - zhe
+- tometo-dev
diff --git a/docs/guides/migrating-react-router-app.md b/docs/guides/migrating-react-router-app.md
index dddd004bd68..6671c09d370 100644
--- a/docs/guides/migrating-react-router-app.md
+++ b/docs/guides/migrating-react-router-app.md
@@ -703,7 +703,7 @@ Now then, go off and _remix your app_. We think you'll like what you build along
 [loader-data]: ../route/loader
 [client-only-component]: https://github.com/sergiodxa/remix-utils/blob/main/src/react/client-only.tsx
 [remix-utils]: https://www.npmjs.com/package/remix-utils
-[examples-repository]: https://github.com/remix-run/examples/blob/main/client-only-components/app/routes/index.tsx
+[examples-repository]: https://github.com/remix-run/examples/blob/main/client-only-components/app/routes/_index.tsx
 [react-lazy]: https://reactjs.org/docs/code-splitting.html#reactlazy
 [react-suspense]: https://reactjs.org/docs/react-api.html#reactsuspense
 [client-only-approach]: #client-only-components

From 8f6e21f0a740b245d5283090a42c2b7542720245 Mon Sep 17 00:00:00 2001
From: Remix Run Bot <hello@remix.run>
Date: Wed, 13 Mar 2024 13:20:56 +0000
Subject: [PATCH 011/108] chore: format

---
 contributors.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributors.yml b/contributors.yml
index ebfc75288cf..2de71e7751c 100644
--- a/contributors.yml
+++ b/contributors.yml
@@ -608,6 +608,7 @@
 - tombyrer
 - tomer-yechiel
 - TomerAberbach
+- tometo-dev
 - TomVance
 - toufiqnuur
 - toyozaki
@@ -665,4 +666,3 @@
 - zainfathoni
 - zayenz
 - zhe
-- tometo-dev

From db2e8122b3331e1b9847e01c9c57513cfc0bfde2 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Mon, 18 Mar 2024 17:47:06 -0400
Subject: [PATCH 012/108] Update nightly release to use pnpm since it checks
 out the dev branch (#9075)

---
 .github/workflows/nightly.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 04210bd4980..a07dcca2e2e 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -34,14 +34,17 @@ jobs:
           token: ${{ secrets.NIGHTLY_PAT }}
           fetch-depth: 0
 
+      - name: 📦 Setup pnpm
+        uses: pnpm/action-setup@v3.0.0
+
       - name: ⎔ Setup node
         uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
-          cache: "yarn"
+          cache: "pnpm"
 
       - name: 📥 Install deps
-        run: yarn --frozen-lockfile
+        run: pnpm install --frozen-lockfile
 
       - name: 🕵️ Check for changes
         id: version
@@ -74,12 +77,12 @@ jobs:
           git config --local user.email "hello@remix.run"
           git config --local user.name "Remix Run Bot"
           git checkout -b nightly/${{ steps.version.outputs.NEXT_VERSION }}
-          yarn run version ${{steps.version.outputs.NEXT_VERSION}} --skip-prompt
+          pnpm run version ${{steps.version.outputs.NEXT_VERSION}} --skip-prompt
           git push origin --tags
 
       - name: 🏗 Build
         if: steps.version.outputs.NEXT_VERSION
-        run: yarn build
+        run: pnpm build
 
       - name: 🔐 Setup npm auth
         if: steps.version.outputs.NEXT_VERSION

From e37deebcceb64c72de6a8c3b9aac91d36f63d49a Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Tue, 19 Mar 2024 10:32:58 -0400
Subject: [PATCH 013/108] Move experimental releases to a manually triggered
 workflow (#9082)

---
 .github/workflows/nightly.yml                 |  5 +-
 .../release-experimental-dispatch.yml         | 59 ++++++++++++++++
 .github/workflows/release-experimental.yml    | 67 -------------------
 3 files changed, 60 insertions(+), 71 deletions(-)
 create mode 100644 .github/workflows/release-experimental-dispatch.yml
 delete mode 100644 .github/workflows/release-experimental.yml

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index a07dcca2e2e..1744b3cf68d 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -49,10 +49,7 @@ jobs:
       - name: 🕵️ Check for changes
         id: version
         run: |
-          # get latest commit sha
-          SHA=$(git rev-parse HEAD)
-          # get first 7 characters of sha
-          SHORT_SHA=${SHA::7}
+          SHORT_SHA=$(git rev-parse --short HEAD)
 
           # get latest nightly tag
           LATEST_NIGHTLY_TAG=$(git tag -l v0.0.0-nightly-\* --sort=-creatordate | head -n 1)
diff --git a/.github/workflows/release-experimental-dispatch.yml b/.github/workflows/release-experimental-dispatch.yml
new file mode 100644
index 00000000000..5e636c792af
--- /dev/null
+++ b/.github/workflows/release-experimental-dispatch.yml
@@ -0,0 +1,59 @@
+name: 🧪 Experimental Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      branch:
+        required: true
+
+concurrency: ${{ github.workflow }}-${{ github.ref }}
+
+env:
+  CI: true
+
+jobs:
+  experimental:
+    name: 🧪 Experimental Release
+    if: github.repository == 'remix-run/remix'
+    runs-on: ubuntu-latest
+    steps:
+      - name: ⬇️ Checkout repo
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.inputs.branch }}
+          # checkout using a custom token so that we can push later on
+          token: ${{ secrets.NIGHTLY_PAT }}
+          fetch-depth: 0
+
+      - name: 📦 Setup pnpm
+        uses: pnpm/action-setup@v3.0.0
+
+      - name: ⎔ Setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: ".nvmrc"
+          cache: "pnpm"
+
+      - name: 📥 Install deps
+        run: pnpm install --frozen-lockfile
+
+      - name: ⤴️ Update version
+        run: |
+          git config --local user.email "hello@remix.run"
+          git config --local user.name "Remix Run Bot"
+          SHORT_SHA=$(git rev-parse --short HEAD)
+          NEXT_VERSION=0.0.0-experimental-${SHORT_SHA}
+          git checkout -b experimental/${NEXT_VERSION}
+          pnpm run version ${NEXT_VERSION} --skip-prompt
+          git push origin --tags
+
+      - name: 🏗 Build
+        run: pnpm build
+
+      - name: 🔐 Setup npm auth
+        run: |
+          echo "registry=https://registry.npmjs.org" >> ~/.npmrc
+          echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ~/.npmrc
+
+      - name: 🚀 Publish
+        run: npm run publish
diff --git a/.github/workflows/release-experimental.yml b/.github/workflows/release-experimental.yml
deleted file mode 100644
index c79c36583dc..00000000000
--- a/.github/workflows/release-experimental.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-# Experimental releases are handled a bit differently than standard releases.
-# Experimental releases can be branched from anywhere as they are not intended
-# for general use, and all packages will be versioned and published with the
-# same hash for testing.
-#
-# This workflow will run when a GitHub release is created from experimental
-# version tag. Unlike standard releases created via Changesets, only one tag
-# should be created for all packages.
-#
-# To create a release:
-# - Create a new branch for the release: git checkout -b `release-experimental`
-#   - IMPORTANT: You should always create a new branch so that the version
-#     changes don't accidentally get merged into `dev` or `main`. The branch
-#     name must follow the convention of `release-experimental` or
-#     `release-experimental-[feature]`.
-# - Make whatever changes you need and commit them:
-#   - `git add . && git commit "experimental changes!"`
-# - Update version numbers and create a release tag:
-#   - `yarn run version:experimental`
-# - Push to GitHub:
-#   - `git push origin --follow-tags`
-# - Create a new release for the tag on GitHub to trigger the CI workflow that
-#   will publish the release to npm
-
-name: 🚀 Release (experimental)
-on:
-  push:
-    tags:
-      - "v0.0.0-experimental*"
-
-concurrency: ${{ github.workflow }}-${{ github.ref }}
-
-env:
-  CI: true
-
-jobs:
-  release:
-    name: 🧑‍🔬 Experimental Release
-    if: |
-      github.repository == 'remix-run/remix' &&
-      contains(github.ref, 'experimental')
-    runs-on: ubuntu-latest
-    steps:
-      - name: ⬇️ Checkout repo
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: ⎔ Setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: ".nvmrc"
-          cache: "yarn"
-
-      - name: 📥 Install deps
-        run: yarn --frozen-lockfile
-
-      - name: 🏗 Build
-        run: yarn build
-
-      - name: 🔐 Setup npm auth
-        run: |
-          echo "registry=https://registry.npmjs.org" >> ~/.npmrc
-          echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ~/.npmrc
-
-      - name: 🚀 Publish
-        run: npm run publish

From 6167da5e2468b6f186155475395a1d2c2f59ace7 Mon Sep 17 00:00:00 2001
From: Mark Dalgleish <mark.john.dalgleish@gmail.com>
Date: Wed, 20 Mar 2024 08:29:53 +1100
Subject: [PATCH 014/108] Promote Vite templates, nest classic templates
 (#9077)

---
 docs/future/vite.md                           |  12 +-
 docs/guides/templates.md                      |  21 ++-
 docs/index.md                                 |   2 +-
 docs/start/quickstart.md                      |   2 +-
 .../__tests__/fixtures/deno/README.md         |   2 +-
 .../arc/.eslintrc.cjs                         |   0
 .../arc/.gitignore                            |   0
 .../arc/README.md                             |   0
 .../{ => classic-remix-compiler}/arc/app.arc  |   0
 .../arc/app/entry.client.tsx                  |   0
 .../arc/app/entry.server.tsx                  |   0
 .../arc/app/root.tsx                          |   0
 .../arc/app/routes/_index.tsx                 |   0
 .../arc/package.json                          |   0
 .../arc/plugin-remix.js                       |   0
 .../arc/public/favicon.ico                    | Bin
 .../arc/remix.config.js                       |   0
 .../arc/remix.env.d.ts                        |   0
 .../arc/server.ts                             |   0
 .../arc/tsconfig.json                         |   0
 .../cloudflare-pages/.eslintrc.cjs            |   0
 .../cloudflare-pages/.gitignore               |   0
 .../cloudflare-pages/.node-version            |   0
 .../cloudflare-pages/README.md                |   0
 .../cloudflare-pages/app/entry.client.tsx     |   0
 .../cloudflare-pages/app/entry.server.tsx     |   0
 .../cloudflare-pages/app/root.tsx             |   0
 .../cloudflare-pages/app/routes/_index.tsx    |   0
 .../cloudflare-pages/package.json             |   0
 .../cloudflare-pages/public/_headers          |   0
 .../cloudflare-pages/public/_routes.json      |   0
 .../cloudflare-pages/public/favicon.ico       | Bin
 .../cloudflare-pages/remix.config.js          |   0
 .../cloudflare-pages/remix.env.d.ts           |   0
 .../cloudflare-pages/server.ts                |   0
 .../cloudflare-pages/tsconfig.json            |   0
 .../cloudflare-workers/.eslintrc.cjs          |   0
 .../cloudflare-workers/.gitignore             |   0
 .../cloudflare-workers/README.md              |   0
 .../cloudflare-workers/app/entry.client.tsx   |   0
 .../cloudflare-workers/app/entry.server.tsx   |   0
 .../cloudflare-workers/app/root.tsx           |   0
 .../cloudflare-workers/app/routes/_index.tsx  |   0
 .../cloudflare-workers/package.json           |   0
 .../cloudflare-workers/public/favicon.ico     | Bin
 .../cloudflare-workers/remix.config.js        |   0
 .../cloudflare-workers/remix.env.d.ts         |   0
 .../cloudflare-workers/server.ts              |   0
 .../cloudflare-workers/tsconfig.json          |   0
 .../cloudflare-workers/wrangler.toml          |   0
 .../deno/.gitignore                           |   0
 .../deno/.vscode/extensions.json              |   0
 .../deno/.vscode/resolve_npm_imports.json     |   0
 .../deno/.vscode/settings.json                |   0
 .../deno/README.md                            |   2 +-
 .../deno/app/entry.client.tsx                 |   0
 .../deno/app/entry.server.tsx                 |   0
 .../deno/app/root.tsx                         |   0
 .../deno/app/routes/_index.tsx                |   0
 .../deno/deno.json                            |   0
 .../deno/package.json                         |   0
 .../deno/public/favicon.ico                   | Bin
 .../deno/remix.config.js                      |   0
 .../deno/server.ts                            |   0
 .../express}/.eslintrc.cjs                    |   0
 .../express}/.gitignore                       |   0
 .../classic-remix-compiler/express/README.md  |  36 +++++
 .../express}/app/entry.client.tsx             |   0
 .../express}/app/entry.server.tsx             |   0
 .../express}/app/root.tsx                     |   0
 .../express}/app/routes/_index.tsx            |   0
 .../express}/package.json                     |  22 +--
 .../express}/public/favicon.ico               | Bin
 .../express/remix.config.js                   |   0
 .../express/remix.env.d.ts                    |   0
 .../classic-remix-compiler/express/server.js  | 113 ++++++++++++++
 .../express}/tsconfig.json                    |   0
 .../fly/.eslintrc.cjs                         |   0
 .../fly}/.gitignore                           |   1 +
 .../fly/README.md                             |   0
 .../fly}/app/entry.client.tsx                 |   0
 .../fly}/app/entry.server.tsx                 |   0
 .../classic-remix-compiler/fly/app/root.tsx   |  33 +++++
 .../fly}/app/routes/_index.tsx                |   0
 .../fly/package.json                          |   0
 .../fly}/public/favicon.ico                   | Bin
 .../fly/remix.config.js                       |   0
 .../fly/remix.env.d.ts                        |   0
 .../fly}/tsconfig.json                        |  13 +-
 .../remix-javascript/.eslintrc.cjs            |  56 +++++++
 .../remix-javascript/.gitignore               |   6 +
 .../remix-javascript/README.md                |  38 +++++
 .../remix-javascript/app/entry.client.jsx}    |   0
 .../remix-javascript/app/entry.server.jsx     | 121 +++++++++++++++
 .../remix-javascript/app/root.jsx}            |  15 +-
 .../remix-javascript/app/routes/_index.jsx    |  36 +++++
 .../remix-javascript/package.json             |  30 ++++
 .../remix-javascript}/public/favicon.ico      | Bin
 .../remix-javascript/remix.config.js          |   0
 .../remix}/.eslintrc.cjs                      |   0
 .../classic-remix-compiler/remix/.gitignore   |   6 +
 .../classic-remix-compiler/remix/README.md    |  38 +++++
 .../remix/app/entry.client.tsx                |  18 +++
 .../remix/app/entry.server.tsx                | 140 ++++++++++++++++++
 .../classic-remix-compiler/remix/app/root.tsx |  33 +++++
 .../remix/app/routes/_index.tsx               |  41 +++++
 .../classic-remix-compiler/remix/package.json |  38 +++++
 .../remix/public/favicon.ico                  | Bin 0 -> 16958 bytes
 .../remix/remix.config.js                     |   0
 .../remix/remix.env.d.ts                      |   0
 .../remix/tsconfig.json                       |  23 +++
 templates/cloudflare/.eslintrc.cjs            |  83 +++++++++++
 .../.gitignore                                |   0
 .../{vite-cloudflare => cloudflare}/README.md |   0
 templates/cloudflare/app/entry.client.tsx     |  18 +++
 .../app/entry.server.tsx                      |   0
 .../app/root.tsx                              |   0
 .../app/routes/_index.tsx                     |   0
 .../functions/[[path]].ts                     |   0
 .../load-context.ts                           |   0
 .../package.json                              |   0
 templates/cloudflare/public/favicon.ico       | Bin 0 -> 16958 bytes
 .../tsconfig.json                             |   0
 .../vite.config.ts                            |   0
 templates/express/.gitignore                  |   1 -
 templates/express/README.md                   |  16 +-
 templates/express/app/root.tsx                |  16 +-
 templates/express/package.json                |  22 ++-
 templates/express/server.js                   | 119 ++++-----------
 templates/express/tsconfig.json               |  13 +-
 .../{vite-express => express}/vite.config.ts  |   0
 templates/remix-javascript/.eslintrc.cjs      |   6 +-
 templates/remix-javascript/.gitignore         |   1 -
 templates/remix-javascript/README.md          |  18 +--
 .../remix-javascript/app/entry.server.jsx     |  28 +++-
 templates/remix-javascript/app/root.jsx       |  15 +-
 .../remix-javascript/app/routes/_index.jsx    |   7 +-
 templates/remix-javascript/package.json       |  11 +-
 templates/remix-javascript/vite.config.js     |  10 ++
 templates/remix/.gitignore                    |   1 -
 templates/remix/README.md                     |  18 +--
 templates/remix/app/root.tsx                  |  16 +-
 templates/remix/package.json                  |  11 +-
 templates/remix/tsconfig.json                 |  13 +-
 templates/remix/vite.config.ts                |  10 ++
 templates/vite-express/README.md              |  34 -----
 templates/vite-express/server.js              |  54 -------
 147 files changed, 1122 insertions(+), 317 deletions(-)
 rename templates/{ => classic-remix-compiler}/arc/.eslintrc.cjs (100%)
 rename templates/{ => classic-remix-compiler}/arc/.gitignore (100%)
 rename templates/{ => classic-remix-compiler}/arc/README.md (100%)
 rename templates/{ => classic-remix-compiler}/arc/app.arc (100%)
 rename templates/{ => classic-remix-compiler}/arc/app/entry.client.tsx (100%)
 rename templates/{ => classic-remix-compiler}/arc/app/entry.server.tsx (100%)
 rename templates/{ => classic-remix-compiler}/arc/app/root.tsx (100%)
 rename templates/{ => classic-remix-compiler}/arc/app/routes/_index.tsx (100%)
 rename templates/{ => classic-remix-compiler}/arc/package.json (100%)
 rename templates/{ => classic-remix-compiler}/arc/plugin-remix.js (100%)
 rename templates/{ => classic-remix-compiler}/arc/public/favicon.ico (100%)
 rename templates/{ => classic-remix-compiler}/arc/remix.config.js (100%)
 rename templates/{ => classic-remix-compiler}/arc/remix.env.d.ts (100%)
 rename templates/{ => classic-remix-compiler}/arc/server.ts (100%)
 rename templates/{ => classic-remix-compiler}/arc/tsconfig.json (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-pages/.eslintrc.cjs (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-pages/.gitignore (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-pages/.node-version (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-pages/README.md (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-pages/app/entry.client.tsx (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-pages/app/entry.server.tsx (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-pages/app/root.tsx (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-pages/app/routes/_index.tsx (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-pages/package.json (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-pages/public/_headers (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-pages/public/_routes.json (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-pages/public/favicon.ico (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-pages/remix.config.js (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-pages/remix.env.d.ts (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-pages/server.ts (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-pages/tsconfig.json (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-workers/.eslintrc.cjs (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-workers/.gitignore (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-workers/README.md (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-workers/app/entry.client.tsx (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-workers/app/entry.server.tsx (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-workers/app/root.tsx (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-workers/app/routes/_index.tsx (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-workers/package.json (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-workers/public/favicon.ico (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-workers/remix.config.js (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-workers/remix.env.d.ts (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-workers/server.ts (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-workers/tsconfig.json (100%)
 rename templates/{ => classic-remix-compiler}/cloudflare-workers/wrangler.toml (100%)
 rename templates/{ => classic-remix-compiler}/deno/.gitignore (100%)
 rename templates/{ => classic-remix-compiler}/deno/.vscode/extensions.json (100%)
 rename templates/{ => classic-remix-compiler}/deno/.vscode/resolve_npm_imports.json (100%)
 rename templates/{ => classic-remix-compiler}/deno/.vscode/settings.json (100%)
 rename templates/{ => classic-remix-compiler}/deno/README.md (97%)
 rename templates/{ => classic-remix-compiler}/deno/app/entry.client.tsx (100%)
 rename templates/{ => classic-remix-compiler}/deno/app/entry.server.tsx (100%)
 rename templates/{ => classic-remix-compiler}/deno/app/root.tsx (100%)
 rename templates/{ => classic-remix-compiler}/deno/app/routes/_index.tsx (100%)
 rename templates/{ => classic-remix-compiler}/deno/deno.json (100%)
 rename templates/{ => classic-remix-compiler}/deno/package.json (100%)
 rename templates/{ => classic-remix-compiler}/deno/public/favicon.ico (100%)
 rename templates/{ => classic-remix-compiler}/deno/remix.config.js (100%)
 rename templates/{ => classic-remix-compiler}/deno/server.ts (100%)
 rename templates/{vite-express => classic-remix-compiler/express}/.eslintrc.cjs (100%)
 rename templates/{fly => classic-remix-compiler/express}/.gitignore (100%)
 create mode 100644 templates/classic-remix-compiler/express/README.md
 rename templates/{fly => classic-remix-compiler/express}/app/entry.client.tsx (100%)
 rename templates/{fly => classic-remix-compiler/express}/app/entry.server.tsx (100%)
 rename templates/{fly => classic-remix-compiler/express}/app/root.tsx (100%)
 rename templates/{fly => classic-remix-compiler/express}/app/routes/_index.tsx (100%)
 rename templates/{vite-express => classic-remix-compiler/express}/package.json (71%)
 rename templates/{fly => classic-remix-compiler/express}/public/favicon.ico (100%)
 rename templates/{ => classic-remix-compiler}/express/remix.config.js (100%)
 rename templates/{ => classic-remix-compiler}/express/remix.env.d.ts (100%)
 create mode 100644 templates/classic-remix-compiler/express/server.js
 rename templates/{fly => classic-remix-compiler/express}/tsconfig.json (100%)
 rename templates/{ => classic-remix-compiler}/fly/.eslintrc.cjs (100%)
 rename templates/{vite-express => classic-remix-compiler/fly}/.gitignore (70%)
 rename templates/{ => classic-remix-compiler}/fly/README.md (100%)
 rename templates/{vite-cloudflare => classic-remix-compiler/fly}/app/entry.client.tsx (100%)
 rename templates/{vite-express => classic-remix-compiler/fly}/app/entry.server.tsx (100%)
 create mode 100644 templates/classic-remix-compiler/fly/app/root.tsx
 rename templates/{vite-express => classic-remix-compiler/fly}/app/routes/_index.tsx (100%)
 rename templates/{ => classic-remix-compiler}/fly/package.json (100%)
 rename templates/{vite-cloudflare => classic-remix-compiler/fly}/public/favicon.ico (100%)
 rename templates/{ => classic-remix-compiler}/fly/remix.config.js (100%)
 rename templates/{ => classic-remix-compiler}/fly/remix.env.d.ts (100%)
 rename templates/{vite-express => classic-remix-compiler/fly}/tsconfig.json (61%)
 create mode 100644 templates/classic-remix-compiler/remix-javascript/.eslintrc.cjs
 create mode 100644 templates/classic-remix-compiler/remix-javascript/.gitignore
 create mode 100644 templates/classic-remix-compiler/remix-javascript/README.md
 rename templates/{vite-express/app/entry.client.tsx => classic-remix-compiler/remix-javascript/app/entry.client.jsx} (100%)
 create mode 100644 templates/classic-remix-compiler/remix-javascript/app/entry.server.jsx
 rename templates/{vite-express/app/root.tsx => classic-remix-compiler/remix-javascript/app/root.jsx} (66%)
 create mode 100644 templates/classic-remix-compiler/remix-javascript/app/routes/_index.jsx
 create mode 100644 templates/classic-remix-compiler/remix-javascript/package.json
 rename templates/{vite-express => classic-remix-compiler/remix-javascript}/public/favicon.ico (100%)
 rename templates/{ => classic-remix-compiler}/remix-javascript/remix.config.js (100%)
 rename templates/{vite-cloudflare => classic-remix-compiler/remix}/.eslintrc.cjs (100%)
 create mode 100644 templates/classic-remix-compiler/remix/.gitignore
 create mode 100644 templates/classic-remix-compiler/remix/README.md
 create mode 100644 templates/classic-remix-compiler/remix/app/entry.client.tsx
 create mode 100644 templates/classic-remix-compiler/remix/app/entry.server.tsx
 create mode 100644 templates/classic-remix-compiler/remix/app/root.tsx
 create mode 100644 templates/classic-remix-compiler/remix/app/routes/_index.tsx
 create mode 100644 templates/classic-remix-compiler/remix/package.json
 create mode 100644 templates/classic-remix-compiler/remix/public/favicon.ico
 rename templates/{ => classic-remix-compiler}/remix/remix.config.js (100%)
 rename templates/{ => classic-remix-compiler}/remix/remix.env.d.ts (100%)
 create mode 100644 templates/classic-remix-compiler/remix/tsconfig.json
 create mode 100644 templates/cloudflare/.eslintrc.cjs
 rename templates/{vite-cloudflare => cloudflare}/.gitignore (100%)
 rename templates/{vite-cloudflare => cloudflare}/README.md (100%)
 create mode 100644 templates/cloudflare/app/entry.client.tsx
 rename templates/{vite-cloudflare => cloudflare}/app/entry.server.tsx (100%)
 rename templates/{vite-cloudflare => cloudflare}/app/root.tsx (100%)
 rename templates/{vite-cloudflare => cloudflare}/app/routes/_index.tsx (100%)
 rename templates/{vite-cloudflare => cloudflare}/functions/[[path]].ts (100%)
 rename templates/{vite-cloudflare => cloudflare}/load-context.ts (100%)
 rename templates/{vite-cloudflare => cloudflare}/package.json (100%)
 create mode 100644 templates/cloudflare/public/favicon.ico
 rename templates/{vite-cloudflare => cloudflare}/tsconfig.json (100%)
 rename templates/{vite-cloudflare => cloudflare}/vite.config.ts (100%)
 rename templates/{vite-express => express}/vite.config.ts (100%)
 create mode 100644 templates/remix-javascript/vite.config.js
 create mode 100644 templates/remix/vite.config.ts
 delete mode 100644 templates/vite-express/README.md
 delete mode 100644 templates/vite-express/server.js

diff --git a/docs/future/vite.md b/docs/future/vite.md
index 889a98ce06c..04b88f8c048 100644
--- a/docs/future/vite.md
+++ b/docs/future/vite.md
@@ -20,13 +20,13 @@ We've got a few different Vite-based templates to get you started.
 
 ```shellscript nonumber
 # Minimal server:
-npx create-remix@latest --template remix-run/remix/templates/vite
+npx create-remix@latest
 
 # Express:
-npx create-remix@latest --template remix-run/remix/templates/vite-express
+npx create-remix@latest --template remix-run/remix/templates/express
 
 # Cloudflare:
-npx create-remix@latest --template remix-run/remix/templates/vite-cloudflare
+npx create-remix@latest --template remix-run/remix/templates/cloudflare
 ```
 
 These templates include a `vite.config.ts` file which is where the Remix Vite plugin is configured.
@@ -37,10 +37,10 @@ The Remix Vite plugin is configured via a `vite.config.ts` file at the root of y
 
 ## Cloudflare
 
-To get started with Cloudflare, you can use the [`vite-cloudflare`][template-vite-cloudflare] template:
+To get started with Cloudflare, you can use the [`cloudflare`][template-cloudflare] template:
 
 ```shellscript nonumber
-npx create-remix@latest --template remix-run/remix/templates/vite-cloudflare
+npx create-remix@latest --template remix-run/remix/templates/cloudflare
 ```
 
 There are two ways to run your Cloudflare app locally:
@@ -1091,7 +1091,7 @@ Finally, we were inspired by how other frameworks implemented Vite support:
 - [SvelteKit][sveltekit]
 
 [vite]: https://vitejs.dev
-[template-vite-cloudflare]: https://github.com/remix-run/remix/tree/main/templates/vite-cloudflare
+[template-cloudflare]: https://github.com/remix-run/remix/tree/main/templates/cloudflare
 [public-path]: ../file-conventions/remix-config#publicpath
 [server-build-path]: ../file-conventions/remix-config#serverbuildpath
 [vite-config]: ../file-conventions/vite-config
diff --git a/docs/guides/templates.md b/docs/guides/templates.md
index ef0314c86b8..6dafaf65e89 100644
--- a/docs/guides/templates.md
+++ b/docs/guides/templates.md
@@ -29,18 +29,23 @@ This is a great place to start if you're just looking to try out Remix for the f
 If you want more control over your server or wish to deploy to a non-node runtime—such as [Arc][arc], [Cloudflare][cloudflare], or [Deno][deno]—then you can try one of our [official templates][official_templates] from the Remix repository:
 
 ```shellscript nonumber
-npx create-remix@latest --template remix-run/remix/templates/arc
-npx create-remix@latest --template remix-run/remix/templates/cloudflare-pages
-npx create-remix@latest --template remix-run/remix/templates/cloudflare-workers
-npx create-remix@latest --template remix-run/remix/templates/deno
+npx create-remix@latest --template remix-run/remix/templates/cloudflare
 npx create-remix@latest --template remix-run/remix/templates/express
-npx create-remix@latest --template remix-run/remix/templates/fly
-npx create-remix@latest --template remix-run/remix/templates/vite-cloudflare
-npx create-remix@latest --template remix-run/remix/templates/vite-express
-npx create-remix@latest --template remix-run/remix/templates/vite
+npx create-remix@latest --template remix-run/remix/templates/remix
+npx create-remix@latest --template remix-run/remix/templates/remix-javascript
 
 ## SPA Mode
 npx create-remix@latest --template remix-run/remix/templates/spa
+
+## Classic Remix Compiler
+npx create-remix@latest --template remix-run/remix/templates/classic-remix-compiler/arc
+npx create-remix@latest --template remix-run/remix/templates/classic-remix-compiler/cloudflare-pages
+npx create-remix@latest --template remix-run/remix/templates/classic-remix-compiler/cloudflare-workers
+npx create-remix@latest --template remix-run/remix/templates/classic-remix-compiler/deno
+npx create-remix@latest --template remix-run/remix/templates/classic-remix-compiler/express
+npx create-remix@latest --template remix-run/remix/templates/classic-remix-compiler/fly
+npx create-remix@latest --template remix-run/remix/templates/classic-remix-compiler/remix
+npx create-remix@latest --template remix-run/remix/templates/classic-remix-compiler/remix-javascript
 ```
 
 ### Third-Party Templates
diff --git a/docs/index.md b/docs/index.md
index e7a554bcfd0..cf5c2439ebf 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -9,7 +9,7 @@ hidden: true
 # Remix Docs
 
 ```shellscript nonumber
-npx create-remix@latest --template remix-run/remix/templates/vite
+npx create-remix@latest
 ```
 
 <docs-cards>
diff --git a/docs/start/quickstart.md b/docs/start/quickstart.md
index 26c7c252e7e..5acb3b40b80 100644
--- a/docs/start/quickstart.md
+++ b/docs/start/quickstart.md
@@ -12,7 +12,7 @@ When you're ready to get serious about your Remix project, you might consider st
 If you prefer to initialize a batteries-included Remix project, you can use the [`create-remix` CLI][create-remix]:
 
 ```shellscript nonumber
-npx create-remix@latest --template remix-run/remix/templates/vite
+npx create-remix@latest
 ```
 
 ## Installation
diff --git a/packages/remix-dev/__tests__/fixtures/deno/README.md b/packages/remix-dev/__tests__/fixtures/deno/README.md
index f13401acb0a..3e7473485e7 100644
--- a/packages/remix-dev/__tests__/fixtures/deno/README.md
+++ b/packages/remix-dev/__tests__/fixtures/deno/README.md
@@ -7,7 +7,7 @@ For more, check out the [Remix docs](https://remix.run/docs).
 ## Install
 
 ```sh
-npx create-remix@latest --template remix-run/remix/templates/deno
+npx create-remix@latest --template remix-run/remix/templates/classic-remix-compiler/deno
 ```
 
 ## Managing dependencies
diff --git a/templates/arc/.eslintrc.cjs b/templates/classic-remix-compiler/arc/.eslintrc.cjs
similarity index 100%
rename from templates/arc/.eslintrc.cjs
rename to templates/classic-remix-compiler/arc/.eslintrc.cjs
diff --git a/templates/arc/.gitignore b/templates/classic-remix-compiler/arc/.gitignore
similarity index 100%
rename from templates/arc/.gitignore
rename to templates/classic-remix-compiler/arc/.gitignore
diff --git a/templates/arc/README.md b/templates/classic-remix-compiler/arc/README.md
similarity index 100%
rename from templates/arc/README.md
rename to templates/classic-remix-compiler/arc/README.md
diff --git a/templates/arc/app.arc b/templates/classic-remix-compiler/arc/app.arc
similarity index 100%
rename from templates/arc/app.arc
rename to templates/classic-remix-compiler/arc/app.arc
diff --git a/templates/arc/app/entry.client.tsx b/templates/classic-remix-compiler/arc/app/entry.client.tsx
similarity index 100%
rename from templates/arc/app/entry.client.tsx
rename to templates/classic-remix-compiler/arc/app/entry.client.tsx
diff --git a/templates/arc/app/entry.server.tsx b/templates/classic-remix-compiler/arc/app/entry.server.tsx
similarity index 100%
rename from templates/arc/app/entry.server.tsx
rename to templates/classic-remix-compiler/arc/app/entry.server.tsx
diff --git a/templates/arc/app/root.tsx b/templates/classic-remix-compiler/arc/app/root.tsx
similarity index 100%
rename from templates/arc/app/root.tsx
rename to templates/classic-remix-compiler/arc/app/root.tsx
diff --git a/templates/arc/app/routes/_index.tsx b/templates/classic-remix-compiler/arc/app/routes/_index.tsx
similarity index 100%
rename from templates/arc/app/routes/_index.tsx
rename to templates/classic-remix-compiler/arc/app/routes/_index.tsx
diff --git a/templates/arc/package.json b/templates/classic-remix-compiler/arc/package.json
similarity index 100%
rename from templates/arc/package.json
rename to templates/classic-remix-compiler/arc/package.json
diff --git a/templates/arc/plugin-remix.js b/templates/classic-remix-compiler/arc/plugin-remix.js
similarity index 100%
rename from templates/arc/plugin-remix.js
rename to templates/classic-remix-compiler/arc/plugin-remix.js
diff --git a/templates/arc/public/favicon.ico b/templates/classic-remix-compiler/arc/public/favicon.ico
similarity index 100%
rename from templates/arc/public/favicon.ico
rename to templates/classic-remix-compiler/arc/public/favicon.ico
diff --git a/templates/arc/remix.config.js b/templates/classic-remix-compiler/arc/remix.config.js
similarity index 100%
rename from templates/arc/remix.config.js
rename to templates/classic-remix-compiler/arc/remix.config.js
diff --git a/templates/arc/remix.env.d.ts b/templates/classic-remix-compiler/arc/remix.env.d.ts
similarity index 100%
rename from templates/arc/remix.env.d.ts
rename to templates/classic-remix-compiler/arc/remix.env.d.ts
diff --git a/templates/arc/server.ts b/templates/classic-remix-compiler/arc/server.ts
similarity index 100%
rename from templates/arc/server.ts
rename to templates/classic-remix-compiler/arc/server.ts
diff --git a/templates/arc/tsconfig.json b/templates/classic-remix-compiler/arc/tsconfig.json
similarity index 100%
rename from templates/arc/tsconfig.json
rename to templates/classic-remix-compiler/arc/tsconfig.json
diff --git a/templates/cloudflare-pages/.eslintrc.cjs b/templates/classic-remix-compiler/cloudflare-pages/.eslintrc.cjs
similarity index 100%
rename from templates/cloudflare-pages/.eslintrc.cjs
rename to templates/classic-remix-compiler/cloudflare-pages/.eslintrc.cjs
diff --git a/templates/cloudflare-pages/.gitignore b/templates/classic-remix-compiler/cloudflare-pages/.gitignore
similarity index 100%
rename from templates/cloudflare-pages/.gitignore
rename to templates/classic-remix-compiler/cloudflare-pages/.gitignore
diff --git a/templates/cloudflare-pages/.node-version b/templates/classic-remix-compiler/cloudflare-pages/.node-version
similarity index 100%
rename from templates/cloudflare-pages/.node-version
rename to templates/classic-remix-compiler/cloudflare-pages/.node-version
diff --git a/templates/cloudflare-pages/README.md b/templates/classic-remix-compiler/cloudflare-pages/README.md
similarity index 100%
rename from templates/cloudflare-pages/README.md
rename to templates/classic-remix-compiler/cloudflare-pages/README.md
diff --git a/templates/cloudflare-pages/app/entry.client.tsx b/templates/classic-remix-compiler/cloudflare-pages/app/entry.client.tsx
similarity index 100%
rename from templates/cloudflare-pages/app/entry.client.tsx
rename to templates/classic-remix-compiler/cloudflare-pages/app/entry.client.tsx
diff --git a/templates/cloudflare-pages/app/entry.server.tsx b/templates/classic-remix-compiler/cloudflare-pages/app/entry.server.tsx
similarity index 100%
rename from templates/cloudflare-pages/app/entry.server.tsx
rename to templates/classic-remix-compiler/cloudflare-pages/app/entry.server.tsx
diff --git a/templates/cloudflare-pages/app/root.tsx b/templates/classic-remix-compiler/cloudflare-pages/app/root.tsx
similarity index 100%
rename from templates/cloudflare-pages/app/root.tsx
rename to templates/classic-remix-compiler/cloudflare-pages/app/root.tsx
diff --git a/templates/cloudflare-pages/app/routes/_index.tsx b/templates/classic-remix-compiler/cloudflare-pages/app/routes/_index.tsx
similarity index 100%
rename from templates/cloudflare-pages/app/routes/_index.tsx
rename to templates/classic-remix-compiler/cloudflare-pages/app/routes/_index.tsx
diff --git a/templates/cloudflare-pages/package.json b/templates/classic-remix-compiler/cloudflare-pages/package.json
similarity index 100%
rename from templates/cloudflare-pages/package.json
rename to templates/classic-remix-compiler/cloudflare-pages/package.json
diff --git a/templates/cloudflare-pages/public/_headers b/templates/classic-remix-compiler/cloudflare-pages/public/_headers
similarity index 100%
rename from templates/cloudflare-pages/public/_headers
rename to templates/classic-remix-compiler/cloudflare-pages/public/_headers
diff --git a/templates/cloudflare-pages/public/_routes.json b/templates/classic-remix-compiler/cloudflare-pages/public/_routes.json
similarity index 100%
rename from templates/cloudflare-pages/public/_routes.json
rename to templates/classic-remix-compiler/cloudflare-pages/public/_routes.json
diff --git a/templates/cloudflare-pages/public/favicon.ico b/templates/classic-remix-compiler/cloudflare-pages/public/favicon.ico
similarity index 100%
rename from templates/cloudflare-pages/public/favicon.ico
rename to templates/classic-remix-compiler/cloudflare-pages/public/favicon.ico
diff --git a/templates/cloudflare-pages/remix.config.js b/templates/classic-remix-compiler/cloudflare-pages/remix.config.js
similarity index 100%
rename from templates/cloudflare-pages/remix.config.js
rename to templates/classic-remix-compiler/cloudflare-pages/remix.config.js
diff --git a/templates/cloudflare-pages/remix.env.d.ts b/templates/classic-remix-compiler/cloudflare-pages/remix.env.d.ts
similarity index 100%
rename from templates/cloudflare-pages/remix.env.d.ts
rename to templates/classic-remix-compiler/cloudflare-pages/remix.env.d.ts
diff --git a/templates/cloudflare-pages/server.ts b/templates/classic-remix-compiler/cloudflare-pages/server.ts
similarity index 100%
rename from templates/cloudflare-pages/server.ts
rename to templates/classic-remix-compiler/cloudflare-pages/server.ts
diff --git a/templates/cloudflare-pages/tsconfig.json b/templates/classic-remix-compiler/cloudflare-pages/tsconfig.json
similarity index 100%
rename from templates/cloudflare-pages/tsconfig.json
rename to templates/classic-remix-compiler/cloudflare-pages/tsconfig.json
diff --git a/templates/cloudflare-workers/.eslintrc.cjs b/templates/classic-remix-compiler/cloudflare-workers/.eslintrc.cjs
similarity index 100%
rename from templates/cloudflare-workers/.eslintrc.cjs
rename to templates/classic-remix-compiler/cloudflare-workers/.eslintrc.cjs
diff --git a/templates/cloudflare-workers/.gitignore b/templates/classic-remix-compiler/cloudflare-workers/.gitignore
similarity index 100%
rename from templates/cloudflare-workers/.gitignore
rename to templates/classic-remix-compiler/cloudflare-workers/.gitignore
diff --git a/templates/cloudflare-workers/README.md b/templates/classic-remix-compiler/cloudflare-workers/README.md
similarity index 100%
rename from templates/cloudflare-workers/README.md
rename to templates/classic-remix-compiler/cloudflare-workers/README.md
diff --git a/templates/cloudflare-workers/app/entry.client.tsx b/templates/classic-remix-compiler/cloudflare-workers/app/entry.client.tsx
similarity index 100%
rename from templates/cloudflare-workers/app/entry.client.tsx
rename to templates/classic-remix-compiler/cloudflare-workers/app/entry.client.tsx
diff --git a/templates/cloudflare-workers/app/entry.server.tsx b/templates/classic-remix-compiler/cloudflare-workers/app/entry.server.tsx
similarity index 100%
rename from templates/cloudflare-workers/app/entry.server.tsx
rename to templates/classic-remix-compiler/cloudflare-workers/app/entry.server.tsx
diff --git a/templates/cloudflare-workers/app/root.tsx b/templates/classic-remix-compiler/cloudflare-workers/app/root.tsx
similarity index 100%
rename from templates/cloudflare-workers/app/root.tsx
rename to templates/classic-remix-compiler/cloudflare-workers/app/root.tsx
diff --git a/templates/cloudflare-workers/app/routes/_index.tsx b/templates/classic-remix-compiler/cloudflare-workers/app/routes/_index.tsx
similarity index 100%
rename from templates/cloudflare-workers/app/routes/_index.tsx
rename to templates/classic-remix-compiler/cloudflare-workers/app/routes/_index.tsx
diff --git a/templates/cloudflare-workers/package.json b/templates/classic-remix-compiler/cloudflare-workers/package.json
similarity index 100%
rename from templates/cloudflare-workers/package.json
rename to templates/classic-remix-compiler/cloudflare-workers/package.json
diff --git a/templates/cloudflare-workers/public/favicon.ico b/templates/classic-remix-compiler/cloudflare-workers/public/favicon.ico
similarity index 100%
rename from templates/cloudflare-workers/public/favicon.ico
rename to templates/classic-remix-compiler/cloudflare-workers/public/favicon.ico
diff --git a/templates/cloudflare-workers/remix.config.js b/templates/classic-remix-compiler/cloudflare-workers/remix.config.js
similarity index 100%
rename from templates/cloudflare-workers/remix.config.js
rename to templates/classic-remix-compiler/cloudflare-workers/remix.config.js
diff --git a/templates/cloudflare-workers/remix.env.d.ts b/templates/classic-remix-compiler/cloudflare-workers/remix.env.d.ts
similarity index 100%
rename from templates/cloudflare-workers/remix.env.d.ts
rename to templates/classic-remix-compiler/cloudflare-workers/remix.env.d.ts
diff --git a/templates/cloudflare-workers/server.ts b/templates/classic-remix-compiler/cloudflare-workers/server.ts
similarity index 100%
rename from templates/cloudflare-workers/server.ts
rename to templates/classic-remix-compiler/cloudflare-workers/server.ts
diff --git a/templates/cloudflare-workers/tsconfig.json b/templates/classic-remix-compiler/cloudflare-workers/tsconfig.json
similarity index 100%
rename from templates/cloudflare-workers/tsconfig.json
rename to templates/classic-remix-compiler/cloudflare-workers/tsconfig.json
diff --git a/templates/cloudflare-workers/wrangler.toml b/templates/classic-remix-compiler/cloudflare-workers/wrangler.toml
similarity index 100%
rename from templates/cloudflare-workers/wrangler.toml
rename to templates/classic-remix-compiler/cloudflare-workers/wrangler.toml
diff --git a/templates/deno/.gitignore b/templates/classic-remix-compiler/deno/.gitignore
similarity index 100%
rename from templates/deno/.gitignore
rename to templates/classic-remix-compiler/deno/.gitignore
diff --git a/templates/deno/.vscode/extensions.json b/templates/classic-remix-compiler/deno/.vscode/extensions.json
similarity index 100%
rename from templates/deno/.vscode/extensions.json
rename to templates/classic-remix-compiler/deno/.vscode/extensions.json
diff --git a/templates/deno/.vscode/resolve_npm_imports.json b/templates/classic-remix-compiler/deno/.vscode/resolve_npm_imports.json
similarity index 100%
rename from templates/deno/.vscode/resolve_npm_imports.json
rename to templates/classic-remix-compiler/deno/.vscode/resolve_npm_imports.json
diff --git a/templates/deno/.vscode/settings.json b/templates/classic-remix-compiler/deno/.vscode/settings.json
similarity index 100%
rename from templates/deno/.vscode/settings.json
rename to templates/classic-remix-compiler/deno/.vscode/settings.json
diff --git a/templates/deno/README.md b/templates/classic-remix-compiler/deno/README.md
similarity index 97%
rename from templates/deno/README.md
rename to templates/classic-remix-compiler/deno/README.md
index dc0798d05d0..af4ab2b5d3e 100644
--- a/templates/deno/README.md
+++ b/templates/classic-remix-compiler/deno/README.md
@@ -7,7 +7,7 @@ For more, check out the [Remix docs](https://remix.run/docs).
 ## Install
 
 ```sh
-npx create-remix@latest --template remix-run/remix/templates/deno
+npx create-remix@latest --template remix-run/remix/templates/classic-remix-compiler/deno
 ```
 
 ## Managing dependencies
diff --git a/templates/deno/app/entry.client.tsx b/templates/classic-remix-compiler/deno/app/entry.client.tsx
similarity index 100%
rename from templates/deno/app/entry.client.tsx
rename to templates/classic-remix-compiler/deno/app/entry.client.tsx
diff --git a/templates/deno/app/entry.server.tsx b/templates/classic-remix-compiler/deno/app/entry.server.tsx
similarity index 100%
rename from templates/deno/app/entry.server.tsx
rename to templates/classic-remix-compiler/deno/app/entry.server.tsx
diff --git a/templates/deno/app/root.tsx b/templates/classic-remix-compiler/deno/app/root.tsx
similarity index 100%
rename from templates/deno/app/root.tsx
rename to templates/classic-remix-compiler/deno/app/root.tsx
diff --git a/templates/deno/app/routes/_index.tsx b/templates/classic-remix-compiler/deno/app/routes/_index.tsx
similarity index 100%
rename from templates/deno/app/routes/_index.tsx
rename to templates/classic-remix-compiler/deno/app/routes/_index.tsx
diff --git a/templates/deno/deno.json b/templates/classic-remix-compiler/deno/deno.json
similarity index 100%
rename from templates/deno/deno.json
rename to templates/classic-remix-compiler/deno/deno.json
diff --git a/templates/deno/package.json b/templates/classic-remix-compiler/deno/package.json
similarity index 100%
rename from templates/deno/package.json
rename to templates/classic-remix-compiler/deno/package.json
diff --git a/templates/deno/public/favicon.ico b/templates/classic-remix-compiler/deno/public/favicon.ico
similarity index 100%
rename from templates/deno/public/favicon.ico
rename to templates/classic-remix-compiler/deno/public/favicon.ico
diff --git a/templates/deno/remix.config.js b/templates/classic-remix-compiler/deno/remix.config.js
similarity index 100%
rename from templates/deno/remix.config.js
rename to templates/classic-remix-compiler/deno/remix.config.js
diff --git a/templates/deno/server.ts b/templates/classic-remix-compiler/deno/server.ts
similarity index 100%
rename from templates/deno/server.ts
rename to templates/classic-remix-compiler/deno/server.ts
diff --git a/templates/vite-express/.eslintrc.cjs b/templates/classic-remix-compiler/express/.eslintrc.cjs
similarity index 100%
rename from templates/vite-express/.eslintrc.cjs
rename to templates/classic-remix-compiler/express/.eslintrc.cjs
diff --git a/templates/fly/.gitignore b/templates/classic-remix-compiler/express/.gitignore
similarity index 100%
rename from templates/fly/.gitignore
rename to templates/classic-remix-compiler/express/.gitignore
diff --git a/templates/classic-remix-compiler/express/README.md b/templates/classic-remix-compiler/express/README.md
new file mode 100644
index 00000000000..4f569a53864
--- /dev/null
+++ b/templates/classic-remix-compiler/express/README.md
@@ -0,0 +1,36 @@
+# Welcome to Remix!
+
+- [Remix Docs](https://remix.run/docs)
+
+## Development
+
+Start the Remix development asset server and the Express server by running:
+
+```sh
+npm run dev
+```
+
+This starts your app in development mode, which will purge the server require cache when Remix rebuilds assets so you don't need a process manager restarting the express server.
+
+## Deployment
+
+First, build your app for production:
+
+```sh
+npm run build
+```
+
+Then run the app in production mode:
+
+```sh
+npm start
+```
+
+Now you'll need to pick a host to deploy it to.
+
+### DIY
+
+If you're familiar with deploying express applications you should be right at home just make sure to deploy the output of `remix build`
+
+- `build/`
+- `public/build/`
diff --git a/templates/fly/app/entry.client.tsx b/templates/classic-remix-compiler/express/app/entry.client.tsx
similarity index 100%
rename from templates/fly/app/entry.client.tsx
rename to templates/classic-remix-compiler/express/app/entry.client.tsx
diff --git a/templates/fly/app/entry.server.tsx b/templates/classic-remix-compiler/express/app/entry.server.tsx
similarity index 100%
rename from templates/fly/app/entry.server.tsx
rename to templates/classic-remix-compiler/express/app/entry.server.tsx
diff --git a/templates/fly/app/root.tsx b/templates/classic-remix-compiler/express/app/root.tsx
similarity index 100%
rename from templates/fly/app/root.tsx
rename to templates/classic-remix-compiler/express/app/root.tsx
diff --git a/templates/fly/app/routes/_index.tsx b/templates/classic-remix-compiler/express/app/routes/_index.tsx
similarity index 100%
rename from templates/fly/app/routes/_index.tsx
rename to templates/classic-remix-compiler/express/app/routes/_index.tsx
diff --git a/templates/vite-express/package.json b/templates/classic-remix-compiler/express/package.json
similarity index 71%
rename from templates/vite-express/package.json
rename to templates/classic-remix-compiler/express/package.json
index a6905c117b6..a619d61844b 100644
--- a/templates/vite-express/package.json
+++ b/templates/classic-remix-compiler/express/package.json
@@ -3,42 +3,44 @@
   "sideEffects": false,
   "type": "module",
   "scripts": {
-    "build": "remix vite:build",
-    "dev": "node ./server.js",
+    "build": "remix build",
+    "dev": "remix dev --manual -c \"node --watch-path server.js --watch server.js\"",
     "lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
     "start": "cross-env NODE_ENV=production node ./server.js",
     "typecheck": "tsc"
   },
   "dependencies": {
+    "@remix-run/css-bundle": "*",
     "@remix-run/express": "*",
     "@remix-run/node": "*",
     "@remix-run/react": "*",
     "compression": "^1.7.4",
+    "cross-env": "^7.0.3",
     "express": "^4.18.2",
     "isbot": "^4.1.0",
     "morgan": "^1.10.0",
     "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "react-dom": "^18.2.0",
+    "source-map-support": "^0.5.21"
   },
   "devDependencies": {
     "@remix-run/dev": "*",
-    "@types/compression": "^1.7.5",
-    "@types/express": "^4.17.20",
-    "@types/morgan": "^1.9.9",
+    "@types/compression": "^1.7.2",
+    "@types/express": "^4.17.17",
+    "@types/morgan": "^1.9.4",
     "@types/react": "^18.2.20",
     "@types/react-dom": "^18.2.7",
+    "@types/source-map-support": "^0.5.6",
     "@typescript-eslint/eslint-plugin": "^6.7.4",
     "@typescript-eslint/parser": "^6.7.4",
-    "cross-env": "^7.0.3",
+    "chokidar": "^3.5.3",
     "eslint": "^8.38.0",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-jsx-a11y": "^6.7.1",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "typescript": "^5.1.6",
-    "vite": "^5.1.0",
-    "vite-tsconfig-paths": "^4.2.1"
+    "typescript": "^5.1.6"
   },
   "engines": {
     "node": ">=18.0.0"
diff --git a/templates/fly/public/favicon.ico b/templates/classic-remix-compiler/express/public/favicon.ico
similarity index 100%
rename from templates/fly/public/favicon.ico
rename to templates/classic-remix-compiler/express/public/favicon.ico
diff --git a/templates/express/remix.config.js b/templates/classic-remix-compiler/express/remix.config.js
similarity index 100%
rename from templates/express/remix.config.js
rename to templates/classic-remix-compiler/express/remix.config.js
diff --git a/templates/express/remix.env.d.ts b/templates/classic-remix-compiler/express/remix.env.d.ts
similarity index 100%
rename from templates/express/remix.env.d.ts
rename to templates/classic-remix-compiler/express/remix.env.d.ts
diff --git a/templates/classic-remix-compiler/express/server.js b/templates/classic-remix-compiler/express/server.js
new file mode 100644
index 00000000000..38406cef874
--- /dev/null
+++ b/templates/classic-remix-compiler/express/server.js
@@ -0,0 +1,113 @@
+import * as fs from "node:fs";
+import * as path from "node:path";
+import * as url from "node:url";
+
+import { createRequestHandler } from "@remix-run/express";
+import { broadcastDevReady, installGlobals } from "@remix-run/node";
+import compression from "compression";
+import express from "express";
+import morgan from "morgan";
+import sourceMapSupport from "source-map-support";
+
+sourceMapSupport.install({
+  retrieveSourceMap: function (source) {
+    const match = source.startsWith("file://");
+    if (match) {
+      const filePath = url.fileURLToPath(source);
+      const sourceMapPath = `${filePath}.map`;
+      if (fs.existsSync(sourceMapPath)) {
+        return {
+          url: source,
+          map: fs.readFileSync(sourceMapPath, "utf8"),
+        };
+      }
+    }
+    return null;
+  },
+});
+installGlobals();
+
+/** @typedef {import('@remix-run/node').ServerBuild} ServerBuild */
+
+const BUILD_PATH = path.resolve("build/index.js");
+const VERSION_PATH = path.resolve("build/version.txt");
+
+const initialBuild = await reimportServer();
+const remixHandler =
+  process.env.NODE_ENV === "development"
+    ? await createDevRequestHandler(initialBuild)
+    : createRequestHandler({ build: initialBuild });
+
+const app = express();
+
+app.use(compression());
+
+// http://expressjs.com/en/advanced/best-practice-security.html#at-a-minimum-disable-x-powered-by-header
+app.disable("x-powered-by");
+
+// Remix fingerprints its assets so we can cache forever.
+app.use(
+  "/build",
+  express.static("public/build", { immutable: true, maxAge: "1y" })
+);
+
+// Everything else (like favicon.ico) is cached for an hour. You may want to be
+// more aggressive with this caching.
+app.use(express.static("public", { maxAge: "1h" }));
+
+app.use(morgan("tiny"));
+
+app.all("*", remixHandler);
+
+const port = process.env.PORT || 3000;
+app.listen(port, async () => {
+  console.log(`Express server listening at http://localhost:${port}`);
+
+  if (process.env.NODE_ENV === "development") {
+    broadcastDevReady(initialBuild);
+  }
+});
+
+/**
+ * @returns {Promise<ServerBuild>}
+ */
+async function reimportServer() {
+  const stat = fs.statSync(BUILD_PATH);
+
+  // convert build path to URL for Windows compatibility with dynamic `import`
+  const BUILD_URL = url.pathToFileURL(BUILD_PATH).href;
+
+  // use a timestamp query parameter to bust the import cache
+  return import(BUILD_URL + "?t=" + stat.mtimeMs);
+}
+
+/**
+ * @param {ServerBuild} initialBuild
+ * @returns {Promise<import('@remix-run/express').RequestHandler>}
+ */
+async function createDevRequestHandler(initialBuild) {
+  let build = initialBuild;
+  async function handleServerUpdate() {
+    // 1. re-import the server build
+    build = await reimportServer();
+    // 2. tell Remix that this app server is now up-to-date and ready
+    broadcastDevReady(build);
+  }
+  const chokidar = await import("chokidar");
+  chokidar
+    .watch(VERSION_PATH, { ignoreInitial: true })
+    .on("add", handleServerUpdate)
+    .on("change", handleServerUpdate);
+
+  // wrap request handler to make sure its recreated with the latest build for every request
+  return async (req, res, next) => {
+    try {
+      return createRequestHandler({
+        build,
+        mode: "development",
+      })(req, res, next);
+    } catch (error) {
+      next(error);
+    }
+  };
+}
diff --git a/templates/fly/tsconfig.json b/templates/classic-remix-compiler/express/tsconfig.json
similarity index 100%
rename from templates/fly/tsconfig.json
rename to templates/classic-remix-compiler/express/tsconfig.json
diff --git a/templates/fly/.eslintrc.cjs b/templates/classic-remix-compiler/fly/.eslintrc.cjs
similarity index 100%
rename from templates/fly/.eslintrc.cjs
rename to templates/classic-remix-compiler/fly/.eslintrc.cjs
diff --git a/templates/vite-express/.gitignore b/templates/classic-remix-compiler/fly/.gitignore
similarity index 70%
rename from templates/vite-express/.gitignore
rename to templates/classic-remix-compiler/fly/.gitignore
index 80ec311f4ff..3f7bf98da3e 100644
--- a/templates/vite-express/.gitignore
+++ b/templates/classic-remix-compiler/fly/.gitignore
@@ -2,4 +2,5 @@ node_modules
 
 /.cache
 /build
+/public/build
 .env
diff --git a/templates/fly/README.md b/templates/classic-remix-compiler/fly/README.md
similarity index 100%
rename from templates/fly/README.md
rename to templates/classic-remix-compiler/fly/README.md
diff --git a/templates/vite-cloudflare/app/entry.client.tsx b/templates/classic-remix-compiler/fly/app/entry.client.tsx
similarity index 100%
rename from templates/vite-cloudflare/app/entry.client.tsx
rename to templates/classic-remix-compiler/fly/app/entry.client.tsx
diff --git a/templates/vite-express/app/entry.server.tsx b/templates/classic-remix-compiler/fly/app/entry.server.tsx
similarity index 100%
rename from templates/vite-express/app/entry.server.tsx
rename to templates/classic-remix-compiler/fly/app/entry.server.tsx
diff --git a/templates/classic-remix-compiler/fly/app/root.tsx b/templates/classic-remix-compiler/fly/app/root.tsx
new file mode 100644
index 00000000000..b46b8fb15bc
--- /dev/null
+++ b/templates/classic-remix-compiler/fly/app/root.tsx
@@ -0,0 +1,33 @@
+import { cssBundleHref } from "@remix-run/css-bundle";
+import type { LinksFunction } from "@remix-run/node";
+import {
+  Links,
+  LiveReload,
+  Meta,
+  Outlet,
+  Scripts,
+  ScrollRestoration,
+} from "@remix-run/react";
+
+export const links: LinksFunction = () => [
+  ...(cssBundleHref ? [{ rel: "stylesheet", href: cssBundleHref }] : []),
+];
+
+export default function App() {
+  return (
+    <html lang="en">
+      <head>
+        <meta charSet="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <Meta />
+        <Links />
+      </head>
+      <body>
+        <Outlet />
+        <ScrollRestoration />
+        <Scripts />
+        <LiveReload />
+      </body>
+    </html>
+  );
+}
diff --git a/templates/vite-express/app/routes/_index.tsx b/templates/classic-remix-compiler/fly/app/routes/_index.tsx
similarity index 100%
rename from templates/vite-express/app/routes/_index.tsx
rename to templates/classic-remix-compiler/fly/app/routes/_index.tsx
diff --git a/templates/fly/package.json b/templates/classic-remix-compiler/fly/package.json
similarity index 100%
rename from templates/fly/package.json
rename to templates/classic-remix-compiler/fly/package.json
diff --git a/templates/vite-cloudflare/public/favicon.ico b/templates/classic-remix-compiler/fly/public/favicon.ico
similarity index 100%
rename from templates/vite-cloudflare/public/favicon.ico
rename to templates/classic-remix-compiler/fly/public/favicon.ico
diff --git a/templates/fly/remix.config.js b/templates/classic-remix-compiler/fly/remix.config.js
similarity index 100%
rename from templates/fly/remix.config.js
rename to templates/classic-remix-compiler/fly/remix.config.js
diff --git a/templates/fly/remix.env.d.ts b/templates/classic-remix-compiler/fly/remix.env.d.ts
similarity index 100%
rename from templates/fly/remix.env.d.ts
rename to templates/classic-remix-compiler/fly/remix.env.d.ts
diff --git a/templates/vite-express/tsconfig.json b/templates/classic-remix-compiler/fly/tsconfig.json
similarity index 61%
rename from templates/vite-express/tsconfig.json
rename to templates/classic-remix-compiler/fly/tsconfig.json
index 9d87dd378f5..7edc18b084a 100644
--- a/templates/vite-express/tsconfig.json
+++ b/templates/classic-remix-compiler/fly/tsconfig.json
@@ -1,19 +1,10 @@
 {
-  "include": [
-    "**/*.ts",
-    "**/*.tsx",
-    "**/.server/**/*.ts",
-    "**/.server/**/*.tsx",
-    "**/.client/**/*.ts",
-    "**/.client/**/*.tsx"
-  ],
+  "include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],
   "compilerOptions": {
     "lib": ["DOM", "DOM.Iterable", "ES2022"],
-    "types": ["@remix-run/node", "vite/client"],
     "isolatedModules": true,
     "esModuleInterop": true,
     "jsx": "react-jsx",
-    "module": "ESNext",
     "moduleResolution": "Bundler",
     "resolveJsonModule": true,
     "target": "ES2022",
@@ -26,7 +17,7 @@
       "~/*": ["./app/*"]
     },
 
-    // Vite takes care of building everything, not tsc.
+    // Remix takes care of building everything in `remix build`.
     "noEmit": true
   }
 }
diff --git a/templates/classic-remix-compiler/remix-javascript/.eslintrc.cjs b/templates/classic-remix-compiler/remix-javascript/.eslintrc.cjs
new file mode 100644
index 00000000000..7c254f1ca5d
--- /dev/null
+++ b/templates/classic-remix-compiler/remix-javascript/.eslintrc.cjs
@@ -0,0 +1,56 @@
+/**
+ * This is intended to be a basic starting point for linting in your app.
+ * It relies on recommended configs out of the box for simplicity, but you can
+ * and should modify this configuration to best suit your team's needs.
+ */
+
+/** @type {import('eslint').Linter.Config} */
+module.exports = {
+  root: true,
+  parserOptions: {
+    ecmaVersion: "latest",
+    sourceType: "module",
+    ecmaFeatures: {
+      jsx: true,
+    },
+  },
+  env: {
+    browser: true,
+    commonjs: true,
+    es6: true,
+  },
+
+  // Base config
+  extends: ["eslint:recommended"],
+
+  overrides: [
+    {
+      files: ["**/*.{js,jsx}"],
+      plugins: ["react", "jsx-a11y"],
+      extends: [
+        "plugin:react/recommended",
+        "plugin:react/jsx-runtime",
+        "plugin:react-hooks/recommended",
+        "plugin:jsx-a11y/recommended",
+      ],
+      settings: {
+        react: {
+          version: "detect",
+        },
+        formComponents: ["Form"],
+        linkComponents: [
+          { name: "Link", linkAttribute: "to" },
+          { name: "NavLink", linkAttribute: "to" },
+        ],
+      },
+    },
+
+    // Node
+    {
+      files: [".eslintrc.cjs"],
+      env: {
+        node: true,
+      },
+    },
+  ],
+};
diff --git a/templates/classic-remix-compiler/remix-javascript/.gitignore b/templates/classic-remix-compiler/remix-javascript/.gitignore
new file mode 100644
index 00000000000..3f7bf98da3e
--- /dev/null
+++ b/templates/classic-remix-compiler/remix-javascript/.gitignore
@@ -0,0 +1,6 @@
+node_modules
+
+/.cache
+/build
+/public/build
+.env
diff --git a/templates/classic-remix-compiler/remix-javascript/README.md b/templates/classic-remix-compiler/remix-javascript/README.md
new file mode 100644
index 00000000000..da8d02ad77c
--- /dev/null
+++ b/templates/classic-remix-compiler/remix-javascript/README.md
@@ -0,0 +1,38 @@
+# Welcome to Remix!
+
+- [Remix Docs](https://remix.run/docs)
+
+## Development
+
+From your terminal:
+
+```sh
+npm run dev
+```
+
+This starts your app in development mode, rebuilding assets on file changes.
+
+## Deployment
+
+First, build your app for production:
+
+```sh
+npm run build
+```
+
+Then run the app in production mode:
+
+```sh
+npm start
+```
+
+Now you'll need to pick a host to deploy it to.
+
+### DIY
+
+If you're familiar with deploying node applications, the built-in Remix app server is production-ready.
+
+Make sure to deploy the output of `remix build`
+
+- `build/`
+- `public/build/`
diff --git a/templates/vite-express/app/entry.client.tsx b/templates/classic-remix-compiler/remix-javascript/app/entry.client.jsx
similarity index 100%
rename from templates/vite-express/app/entry.client.tsx
rename to templates/classic-remix-compiler/remix-javascript/app/entry.client.jsx
diff --git a/templates/classic-remix-compiler/remix-javascript/app/entry.server.jsx b/templates/classic-remix-compiler/remix-javascript/app/entry.server.jsx
new file mode 100644
index 00000000000..386849510c9
--- /dev/null
+++ b/templates/classic-remix-compiler/remix-javascript/app/entry.server.jsx
@@ -0,0 +1,121 @@
+/**
+ * By default, Remix will handle generating the HTTP Response for you.
+ * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨
+ * For more information, see https://remix.run/file-conventions/entry.server
+ */
+
+import { PassThrough } from "node:stream";
+
+import { createReadableStreamFromReadable } from "@remix-run/node";
+import { RemixServer } from "@remix-run/react";
+import { isbot } from "isbot";
+import { renderToPipeableStream } from "react-dom/server";
+
+const ABORT_DELAY = 5_000;
+
+export default function handleRequest(
+  request,
+  responseStatusCode,
+  responseHeaders,
+  remixContext
+) {
+  return isbot(request.headers.get("user-agent") || "")
+    ? handleBotRequest(
+        request,
+        responseStatusCode,
+        responseHeaders,
+        remixContext
+      )
+    : handleBrowserRequest(
+        request,
+        responseStatusCode,
+        responseHeaders,
+        remixContext
+      );
+}
+
+function handleBotRequest(
+  request,
+  responseStatusCode,
+  responseHeaders,
+  remixContext
+) {
+  return new Promise((resolve, reject) => {
+    const { pipe, abort } = renderToPipeableStream(
+      <RemixServer
+        context={remixContext}
+        url={request.url}
+        abortDelay={ABORT_DELAY}
+      />,
+      {
+        onAllReady() {
+          const body = new PassThrough();
+          const stream = createReadableStreamFromReadable(body);
+
+          responseHeaders.set("Content-Type", "text/html");
+
+          resolve(
+            new Response(stream, {
+              headers: responseHeaders,
+              status: responseStatusCode,
+            })
+          );
+
+          pipe(body);
+        },
+        onShellError(error) {
+          reject(error);
+        },
+        onError(error) {
+          responseStatusCode = 500;
+          console.error(error);
+        },
+      }
+    );
+
+    setTimeout(abort, ABORT_DELAY);
+  });
+}
+
+function handleBrowserRequest(
+  request,
+  responseStatusCode,
+  responseHeaders,
+  remixContext
+) {
+  return new Promise((resolve, reject) => {
+    const { pipe, abort } = renderToPipeableStream(
+      <RemixServer
+        context={remixContext}
+        url={request.url}
+        abortDelay={ABORT_DELAY}
+      />,
+      {
+        onShellReady() {
+          const body = new PassThrough();
+          const stream = createReadableStreamFromReadable(body);
+
+          responseHeaders.set("Content-Type", "text/html");
+
+          resolve(
+            new Response(stream, {
+              headers: responseHeaders,
+              status: responseStatusCode,
+            })
+          );
+
+          pipe(body);
+        },
+        onShellError(error) {
+          reject(error);
+        },
+        onError(error) {
+          console.error(error);
+          responseStatusCode = 500;
+        },
+      }
+    );
+
+    setTimeout(abort, ABORT_DELAY);
+  });
+}
diff --git a/templates/vite-express/app/root.tsx b/templates/classic-remix-compiler/remix-javascript/app/root.jsx
similarity index 66%
rename from templates/vite-express/app/root.tsx
rename to templates/classic-remix-compiler/remix-javascript/app/root.jsx
index e82f26fd179..b2badce9519 100644
--- a/templates/vite-express/app/root.tsx
+++ b/templates/classic-remix-compiler/remix-javascript/app/root.jsx
@@ -1,12 +1,18 @@
+import { cssBundleHref } from "@remix-run/css-bundle";
 import {
   Links,
+  LiveReload,
   Meta,
   Outlet,
   Scripts,
   ScrollRestoration,
 } from "@remix-run/react";
 
-export function Layout({ children }: { children: React.ReactNode }) {
+export const links = () => [
+  ...(cssBundleHref ? [{ rel: "stylesheet", href: cssBundleHref }] : []),
+];
+
+export default function App() {
   return (
     <html lang="en">
       <head>
@@ -16,14 +22,11 @@ export function Layout({ children }: { children: React.ReactNode }) {
         <Links />
       </head>
       <body>
-        {children}
+        <Outlet />
         <ScrollRestoration />
         <Scripts />
+        <LiveReload />
       </body>
     </html>
   );
 }
-
-export default function App() {
-  return <Outlet />;
-}
diff --git a/templates/classic-remix-compiler/remix-javascript/app/routes/_index.jsx b/templates/classic-remix-compiler/remix-javascript/app/routes/_index.jsx
new file mode 100644
index 00000000000..cb1687bc50c
--- /dev/null
+++ b/templates/classic-remix-compiler/remix-javascript/app/routes/_index.jsx
@@ -0,0 +1,36 @@
+export const meta = () => {
+  return [{ title: "New Remix App" }];
+};
+
+export default function Index() {
+  return (
+    <div style={{ fontFamily: "system-ui, sans-serif", lineHeight: "1.4" }}>
+      <h1>Welcome to Remix</h1>
+      <ul>
+        <li>
+          <a
+            target="_blank"
+            href="https://remix.run/tutorials/blog"
+            rel="noreferrer"
+          >
+            15m Quickstart Blog Tutorial
+          </a>
+        </li>
+        <li>
+          <a
+            target="_blank"
+            href="https://remix.run/tutorials/jokes"
+            rel="noreferrer"
+          >
+            Deep Dive Jokes App Tutorial
+          </a>
+        </li>
+        <li>
+          <a target="_blank" href="https://remix.run/docs" rel="noreferrer">
+            Remix Docs
+          </a>
+        </li>
+      </ul>
+    </div>
+  );
+}
diff --git a/templates/classic-remix-compiler/remix-javascript/package.json b/templates/classic-remix-compiler/remix-javascript/package.json
new file mode 100644
index 00000000000..6b614da37d0
--- /dev/null
+++ b/templates/classic-remix-compiler/remix-javascript/package.json
@@ -0,0 +1,30 @@
+{
+  "private": true,
+  "sideEffects": false,
+  "type": "module",
+  "scripts": {
+    "build": "remix build",
+    "dev": "remix dev --manual",
+    "lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
+    "start": "remix-serve ./build/index.js"
+  },
+  "dependencies": {
+    "@remix-run/css-bundle": "*",
+    "@remix-run/node": "*",
+    "@remix-run/react": "*",
+    "@remix-run/serve": "*",
+    "isbot": "^4.1.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
+  },
+  "devDependencies": {
+    "@remix-run/dev": "*",
+    "eslint": "^8.38.0",
+    "eslint-plugin-jsx-a11y": "^6.7.1",
+    "eslint-plugin-react": "^7.33.2",
+    "eslint-plugin-react-hooks": "^4.6.0"
+  },
+  "engines": {
+    "node": ">=18.0.0"
+  }
+}
diff --git a/templates/vite-express/public/favicon.ico b/templates/classic-remix-compiler/remix-javascript/public/favicon.ico
similarity index 100%
rename from templates/vite-express/public/favicon.ico
rename to templates/classic-remix-compiler/remix-javascript/public/favicon.ico
diff --git a/templates/remix-javascript/remix.config.js b/templates/classic-remix-compiler/remix-javascript/remix.config.js
similarity index 100%
rename from templates/remix-javascript/remix.config.js
rename to templates/classic-remix-compiler/remix-javascript/remix.config.js
diff --git a/templates/vite-cloudflare/.eslintrc.cjs b/templates/classic-remix-compiler/remix/.eslintrc.cjs
similarity index 100%
rename from templates/vite-cloudflare/.eslintrc.cjs
rename to templates/classic-remix-compiler/remix/.eslintrc.cjs
diff --git a/templates/classic-remix-compiler/remix/.gitignore b/templates/classic-remix-compiler/remix/.gitignore
new file mode 100644
index 00000000000..3f7bf98da3e
--- /dev/null
+++ b/templates/classic-remix-compiler/remix/.gitignore
@@ -0,0 +1,6 @@
+node_modules
+
+/.cache
+/build
+/public/build
+.env
diff --git a/templates/classic-remix-compiler/remix/README.md b/templates/classic-remix-compiler/remix/README.md
new file mode 100644
index 00000000000..da8d02ad77c
--- /dev/null
+++ b/templates/classic-remix-compiler/remix/README.md
@@ -0,0 +1,38 @@
+# Welcome to Remix!
+
+- [Remix Docs](https://remix.run/docs)
+
+## Development
+
+From your terminal:
+
+```sh
+npm run dev
+```
+
+This starts your app in development mode, rebuilding assets on file changes.
+
+## Deployment
+
+First, build your app for production:
+
+```sh
+npm run build
+```
+
+Then run the app in production mode:
+
+```sh
+npm start
+```
+
+Now you'll need to pick a host to deploy it to.
+
+### DIY
+
+If you're familiar with deploying node applications, the built-in Remix app server is production-ready.
+
+Make sure to deploy the output of `remix build`
+
+- `build/`
+- `public/build/`
diff --git a/templates/classic-remix-compiler/remix/app/entry.client.tsx b/templates/classic-remix-compiler/remix/app/entry.client.tsx
new file mode 100644
index 00000000000..94d5dc0de0f
--- /dev/null
+++ b/templates/classic-remix-compiler/remix/app/entry.client.tsx
@@ -0,0 +1,18 @@
+/**
+ * By default, Remix will handle hydrating your app on the client for you.
+ * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨
+ * For more information, see https://remix.run/file-conventions/entry.client
+ */
+
+import { RemixBrowser } from "@remix-run/react";
+import { startTransition, StrictMode } from "react";
+import { hydrateRoot } from "react-dom/client";
+
+startTransition(() => {
+  hydrateRoot(
+    document,
+    <StrictMode>
+      <RemixBrowser />
+    </StrictMode>
+  );
+});
diff --git a/templates/classic-remix-compiler/remix/app/entry.server.tsx b/templates/classic-remix-compiler/remix/app/entry.server.tsx
new file mode 100644
index 00000000000..45db3229c68
--- /dev/null
+++ b/templates/classic-remix-compiler/remix/app/entry.server.tsx
@@ -0,0 +1,140 @@
+/**
+ * By default, Remix will handle generating the HTTP Response for you.
+ * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨
+ * For more information, see https://remix.run/file-conventions/entry.server
+ */
+
+import { PassThrough } from "node:stream";
+
+import type { AppLoadContext, EntryContext } from "@remix-run/node";
+import { createReadableStreamFromReadable } from "@remix-run/node";
+import { RemixServer } from "@remix-run/react";
+import { isbot } from "isbot";
+import { renderToPipeableStream } from "react-dom/server";
+
+const ABORT_DELAY = 5_000;
+
+export default function handleRequest(
+  request: Request,
+  responseStatusCode: number,
+  responseHeaders: Headers,
+  remixContext: EntryContext,
+  // This is ignored so we can keep it in the template for visibility.  Feel
+  // free to delete this parameter in your app if you're not using it!
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  loadContext: AppLoadContext
+) {
+  return isbot(request.headers.get("user-agent") || "")
+    ? handleBotRequest(
+        request,
+        responseStatusCode,
+        responseHeaders,
+        remixContext
+      )
+    : handleBrowserRequest(
+        request,
+        responseStatusCode,
+        responseHeaders,
+        remixContext
+      );
+}
+
+function handleBotRequest(
+  request: Request,
+  responseStatusCode: number,
+  responseHeaders: Headers,
+  remixContext: EntryContext
+) {
+  return new Promise((resolve, reject) => {
+    let shellRendered = false;
+    const { pipe, abort } = renderToPipeableStream(
+      <RemixServer
+        context={remixContext}
+        url={request.url}
+        abortDelay={ABORT_DELAY}
+      />,
+      {
+        onAllReady() {
+          shellRendered = true;
+          const body = new PassThrough();
+          const stream = createReadableStreamFromReadable(body);
+
+          responseHeaders.set("Content-Type", "text/html");
+
+          resolve(
+            new Response(stream, {
+              headers: responseHeaders,
+              status: responseStatusCode,
+            })
+          );
+
+          pipe(body);
+        },
+        onShellError(error: unknown) {
+          reject(error);
+        },
+        onError(error: unknown) {
+          responseStatusCode = 500;
+          // Log streaming rendering errors from inside the shell.  Don't log
+          // errors encountered during initial shell rendering since they'll
+          // reject and get logged in handleDocumentRequest.
+          if (shellRendered) {
+            console.error(error);
+          }
+        },
+      }
+    );
+
+    setTimeout(abort, ABORT_DELAY);
+  });
+}
+
+function handleBrowserRequest(
+  request: Request,
+  responseStatusCode: number,
+  responseHeaders: Headers,
+  remixContext: EntryContext
+) {
+  return new Promise((resolve, reject) => {
+    let shellRendered = false;
+    const { pipe, abort } = renderToPipeableStream(
+      <RemixServer
+        context={remixContext}
+        url={request.url}
+        abortDelay={ABORT_DELAY}
+      />,
+      {
+        onShellReady() {
+          shellRendered = true;
+          const body = new PassThrough();
+          const stream = createReadableStreamFromReadable(body);
+
+          responseHeaders.set("Content-Type", "text/html");
+
+          resolve(
+            new Response(stream, {
+              headers: responseHeaders,
+              status: responseStatusCode,
+            })
+          );
+
+          pipe(body);
+        },
+        onShellError(error: unknown) {
+          reject(error);
+        },
+        onError(error: unknown) {
+          responseStatusCode = 500;
+          // Log streaming rendering errors from inside the shell.  Don't log
+          // errors encountered during initial shell rendering since they'll
+          // reject and get logged in handleDocumentRequest.
+          if (shellRendered) {
+            console.error(error);
+          }
+        },
+      }
+    );
+
+    setTimeout(abort, ABORT_DELAY);
+  });
+}
diff --git a/templates/classic-remix-compiler/remix/app/root.tsx b/templates/classic-remix-compiler/remix/app/root.tsx
new file mode 100644
index 00000000000..b46b8fb15bc
--- /dev/null
+++ b/templates/classic-remix-compiler/remix/app/root.tsx
@@ -0,0 +1,33 @@
+import { cssBundleHref } from "@remix-run/css-bundle";
+import type { LinksFunction } from "@remix-run/node";
+import {
+  Links,
+  LiveReload,
+  Meta,
+  Outlet,
+  Scripts,
+  ScrollRestoration,
+} from "@remix-run/react";
+
+export const links: LinksFunction = () => [
+  ...(cssBundleHref ? [{ rel: "stylesheet", href: cssBundleHref }] : []),
+];
+
+export default function App() {
+  return (
+    <html lang="en">
+      <head>
+        <meta charSet="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <Meta />
+        <Links />
+      </head>
+      <body>
+        <Outlet />
+        <ScrollRestoration />
+        <Scripts />
+        <LiveReload />
+      </body>
+    </html>
+  );
+}
diff --git a/templates/classic-remix-compiler/remix/app/routes/_index.tsx b/templates/classic-remix-compiler/remix/app/routes/_index.tsx
new file mode 100644
index 00000000000..5347369230e
--- /dev/null
+++ b/templates/classic-remix-compiler/remix/app/routes/_index.tsx
@@ -0,0 +1,41 @@
+import type { MetaFunction } from "@remix-run/node";
+
+export const meta: MetaFunction = () => {
+  return [
+    { title: "New Remix App" },
+    { name: "description", content: "Welcome to Remix!" },
+  ];
+};
+
+export default function Index() {
+  return (
+    <div style={{ fontFamily: "system-ui, sans-serif", lineHeight: "1.8" }}>
+      <h1>Welcome to Remix</h1>
+      <ul>
+        <li>
+          <a
+            target="_blank"
+            href="https://remix.run/tutorials/blog"
+            rel="noreferrer"
+          >
+            15m Quickstart Blog Tutorial
+          </a>
+        </li>
+        <li>
+          <a
+            target="_blank"
+            href="https://remix.run/tutorials/jokes"
+            rel="noreferrer"
+          >
+            Deep Dive Jokes App Tutorial
+          </a>
+        </li>
+        <li>
+          <a target="_blank" href="https://remix.run/docs" rel="noreferrer">
+            Remix Docs
+          </a>
+        </li>
+      </ul>
+    </div>
+  );
+}
diff --git a/templates/classic-remix-compiler/remix/package.json b/templates/classic-remix-compiler/remix/package.json
new file mode 100644
index 00000000000..2a43dafd2b8
--- /dev/null
+++ b/templates/classic-remix-compiler/remix/package.json
@@ -0,0 +1,38 @@
+{
+  "private": true,
+  "sideEffects": false,
+  "type": "module",
+  "scripts": {
+    "build": "remix build",
+    "dev": "remix dev --manual",
+    "lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
+    "start": "remix-serve ./build/index.js",
+    "typecheck": "tsc"
+  },
+  "dependencies": {
+    "@remix-run/css-bundle": "*",
+    "@remix-run/node": "*",
+    "@remix-run/react": "*",
+    "@remix-run/serve": "*",
+    "isbot": "^4.1.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
+  },
+  "devDependencies": {
+    "@remix-run/dev": "*",
+    "@types/react": "^18.2.20",
+    "@types/react-dom": "^18.2.7",
+    "@typescript-eslint/eslint-plugin": "^6.7.4",
+    "@typescript-eslint/parser": "^6.7.4",
+    "eslint": "^8.38.0",
+    "eslint-import-resolver-typescript": "^3.6.1",
+    "eslint-plugin-import": "^2.28.1",
+    "eslint-plugin-jsx-a11y": "^6.7.1",
+    "eslint-plugin-react": "^7.33.2",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "typescript": "^5.1.6"
+  },
+  "engines": {
+    "node": ">=18.0.0"
+  }
+}
diff --git a/templates/classic-remix-compiler/remix/public/favicon.ico b/templates/classic-remix-compiler/remix/public/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..8830cf6821b354114848e6354889b8ecf6d2bc61
GIT binary patch
literal 16958
zcmeI3+jCXb9mnJN2h^uNlXH@jlam{_a8F3W{T}Wih>9YJpaf7TUbu)A5fv|h7OMfR
zR;q$lr&D!wv|c)`wcw1?>4QT1(&|jdsrI2h`Rn)dTW5t$8pz=s3_5L?#oBxAowe8R
z_WfPfN?F+@`q$D@rvC?(W!uWieppskmQ~YG*>*L?{img@tWpnYXZslxeh#TSUS3{q
z1Ju6JcfQSbQuORq69@YK(X-3c9vC2c2a2z~zw=F=50@pm0PUiCAm!bAT?2jpM`(^b
zC|2&Ngngt^<>oCv#<S!-dX;>?P(AZ`5_84x#QBPulix)TpkIAUp=(KgGo4CVS~Sxt
zVoR4>r5g9%bDh7hi0|v$={zr>CHd`?-l4^Ld(Z9PNz9piFY+llUw_x4ou7Vf-q%$g
z)&)J4>6Ft~RZ(uV>dJD<Ri@O+ttLaCvYPyTPWL>|`nxI1^x{X<kw8nThj+Y}tw{Or
zRjUv4hrU{KGhbGHm9Ho8JkC+BwU&#I{n0PFy7kVfbG?_+T+m-3nxQ?DUla7zinfMq
z%7#>@Z5S<=vf;V3w_(*O-7}W<=e$=}CB9_R;)m9)d7`d_xx+nl^Bg|%ew=?uoKO8w
zeQU7h;~8s!@9-k>7Cx}<bJ3N5)-UEEpLCvfc#RzR<`8{*xab{Oo3=4^71mT=VdDqW
z($=D$#(h&m+Q#bHD81KM6L?WCy3h+`$eLs0K9?!C`fS>1<o!{ao8ND$Pg}FkS7GCH
zJw}ah!*h61t2v#otd%vZ6+nN#?=TPYL0-^ar*$LiQFUQGZ9^+;N@Jx>SDQ7m(&miH
zs8!l*wOJ!GHbdh)pD--&W3+w`9YJ=;m^FtMY=`mTq8pyV!-@L6smwp3(q?G>=_4v^
zn(ikLue7!y70#2uhqUVpb7fp!=xu2{aM^1P^pts#+feZv8d~)2sf`sjXLQCEj;pdI
z%~f`JOO;*KnziMv^i_6+?mL?^wrE_&=IT9o1i!}Sd4Sx4O@w~1bi1)8<?^1W_hyQJ
z^TuRsvF7h=(){B?>(sXvYR-1?7~Zr<=SJ1Cw!i~yfi=4h6o3O~(-Sb2Ilwq%g$+V`
z>(C&N1!FV5rWF&iwt8~b)=jIn4b!XbrWrZgIHTISrdHcpjjx=TwJXI7_%Ks4oFLl9
zNT;!%!P4~xH85njXdfqgnIxIFOOKW`W$fxU%{{5wZkVF^G=JB$oUNU5dQSL&ZnR1s
z*ckJ$R`eCUJsWL>j6*+|2S1TL_J|Fl&kt=~XZF=+=iT0Xq1*KU-NuH%NAQff$LJp3
zU_*a;@7I0K{mqwux87~vwsp<}@P>KNDb}3U+6$rcZ114|QTMUSk+rhPA(b{$>pQTc
zIQri{+U>GMzsCy0Mo4BfWXJlkk;RhfpWpAB{=Rtr*d1MNC+H3Oi5+3D$gUI&AjV-1
z=0Z<L3zM*4u<g-e=|9$O^MnPHwN`w?DDl)WJ}-Op{;HO&ee}ljeagQt`n!MJWs7Ai
z;3B>Oox+bGyHe=yk-yu%=+{~&46C$ut^ZN+ysx$NH}*F43)3bKkMsxGyIl#>7Yb8W
zO{}&LUO8Ow{7>!bvSq?X{15&Y|4}0w2=o_^0ZzYgB+4HhZ4>s*mW&?RQ6&AY|CPcx
z$*LjftNS|H)ePYnIKNg{ck*|y7EJ&Co0ho0K`!{ENPkASeKy-JWE}dF_%}j)Z5a&q
zXAI2gPu6`s-@baW=*+keiE$A<b_MR?C-5PseqT8KkKDY(u92UZE4^yfJYZmLRl0Qj
z2mi$bu(VF|VOOk`m}JGAX2-zC@9eU}cdfT)cCWW1_iV7|_H3}{?+yJCT{HgFuJ!hW
z-dneDylkh+V;A%t9|&GGNe?DVALeWQ(D9>LIs5G6_X_6kgKK8n3jH2-H9`6bo)Qn1
zZ2x)xPt1=`9V|bE4*;j9$X20+xQCc$rEK<k`Fi~Hjq>|9OwH-O+Q*k`ZNw}K##SkY
z3u}aCV%V|j@!gL5(*5fuWo>JFjeU9Qqk`$bdwH8(qZovE2tA7WUpoCE=VKm^eZ|vZ
z(k<+j*mGJVah>8CkAsMD6#I$RtF;#57Wi`c_^k5?+KCmX$;Ky2*6<J=fcB~4B|ZV&
z?~?BCTu@_QfA&ei^lx3%=--_q{3EVljTZ#}J^n$D1~~>|Q^bJ8+s%2MB}OH-g$Ev^
zO3uqfGjuN%CZiu<`aCuKCh{kK!dDZ+<Fl~arF!o=>CcwgIeU2dsDfz+V>V3BDb~)~
zO!2l!_)m;ZepR~sL+-~s<YrF4FaR4!(myY+152d8&=KNvctHGLWgQw{tVX<yoWW_Z
zj-Hr!ndH7odVllGob8-nW3NBFv0(bY`1FL^9N&SL;FHHcq95!k&HtnS;-hG%hCy5j
z26`MMf5rEpW07<ly2*EzOXtyjasql9V^`87BWQ&$%XE#tlN;dgHVN~f{lTSm_O}mT
zE0})bgjJdY-h#`-)Z`P?PD;&z;T?03pC|DTyTxXaAF{>HS7;5ZB|~uUM&&5vDda2b
z)CW8S6GI*oF><|ZeY5D^+Mcsri)!tmrM33qvwI4r9o@(GlW!u2R>>sB|E#%W`c*@5
z|0iA|`{6aA7D4Q?vc1{vT-#yytn07`H!QIO^1+X7?zG3%y0<K~L$`F=p)E9B=Nsdp
zb=qM)|Jkjbc68S&dsX^=;-v%j)u|KbMf(>gPdIPUJ#s*DNAwd}m1_IMN1^T&be~+E
z_z%1W^9~dl|Me9U6+3oNyuMDkF*z_;dOG(Baa*yq;TRiw{EO~O_S6>e*L(+Cdu(TM
z@o%xTCV%hi&p)x3_inIF!b|W4|AF5p?y1j)cr9RG@v%QVaN8&LaorC-kJz_ExfVHB
za!mtuee#Vb?dh&bwrfGHYAiX&&|v$}U*UBM;#F!N=x>x|G5s0zOa9{(`=k4v^6iK3
z8d&=O@xhDs{;v7<i<J%blPl`%F2zV2g`fBkaG1Pogz882RUuz5)%QjDQ|qVROU;s)
z&2zMiK!4P)&yT-qFYjDtyBF5F{*y1vPxwCS6y&Rpe_)teF|v>JQ%eO;!Bt`&*MH&d
zp^K#dkq;jnJz%%bsqwlaKA5<gd^+Mkxi7IxDK-%BFT|4IAN4BoH1O}I%ID%*E>?fy
zS5JDbO#BgSAdi8<E3bcf{8u~%MEaSFm@4?cP}e`Oy}11ULi6hN?%l2f)C{Mn9*>NM
zDo2SifX6^Z;vn>cBh-?~r_n9qYvP|3ihrnqq6deS-#>l#dV4mX|G%L8|EL;$U+w69
z;rTK3FW$ewUfH|R-Z;3;jvpfiDm?Fvyu9PeR>wi|E8>&j2Z@2h`U}|$><c4e{h$1w
z{FfRq@#VNY57^%!w<Fg>2d`BPV3pz#ViIzH8v6pP^L-p!GbLv<;(p>}_6u&E6XO5-
zJ8JEvJ1)0>{iSd|kOQn#?0rTYL=KSmgMHCf$Qbm;7|8d(goD&T-~oCDuZf57iP#_Y
zmxaoOSjQsm*^u+m$L9AMqwi=6bpdiAY6k3akjGN{xOZ`_J<~Puyzpi7yhhKrLmXV;
z@ftONPy;Uw1F#{_fyGbk04yLE01v=i_5`RqQP+SUH0nb=O?l!J)qCSTdsbmjFJrTm
zx4^ef@qt{B+TV_OHOhtR?XT}1Etm(f21;#qyyW6FpnM+S7*M1iME?9fe8d-`Q#InN
z?^y{C_|8bxgUE@!o+Z72C)BrS&5D`gb-X8kq*1G7Uld-z19V}HY~mK#!o9MC-*#^+
znEsdc-|jj0+%cgBMy(cEkq4IQ1D*b;17Lyp>Utnsz%LRTfjQKL*vo(yJxwtw^)l|!
z7jhIDdtLB}m<l{aZcDUR3Vu-k+`XvA-r9dt!Sv$?zyM+)c*=UnSwkF9d<+EdBK`0Z
zOvSg<Db557lC(Q*`Yt{Kj07Xt>pkOIG&4@F+9cYkS5r%%jz}I0R#F4oBMf-|Jmmk*
zk^OEzF%}%5{a~kGYbFjV1n>HKC+a`;&-n*v_kD2DPP~n5(QE3C;30L<32GB*qV2z$
zWR1Kh=^1-q)P37WS6YWKlUSDe=eD^u_CV+P)q!3^{=$#b^auG<yDY{2eGgE&A8BtO
z4iN3=GdAq!6NGK#1^8e5z+BOTJyYw8ZN6Vq<F5*1vQvB~xg>S7m8zFfFS<>(e~)TG
z&uwWhSoetoe!1^<uYo6XVYh$jYq2>%)O}=6{SUcw-UQmw+i8lokRASPsbT=H|4D|(
zk^P7>TUEFho!3qXSWn$<jp767-aNC~whQ<7bkx~XU6anc7IYxL2j=)Mxg_x)9qvoF
z`x}FAA^ubCS9(wUhmE&MfARUmoSgHZc6;O0te<(<Bs#F)Ewf{<YvCDVx6mZtTa~xm
zriQQIAzi=kic!|RagNu)PQFvP&x`TjzqMDed4BN!oRJwP`eO||`2Qm5kC>m2{lHXw
zD>eN6-;wwq9(?@f^F4L2Ny5_6!d~iiA^s~(|B*lbZir-$&%)l>%Q(36yOIAu|326K
ztmBWz|MLA{Kj(H_{w2gd*nZ6a@ma(w==~EHIscEk|C=NGJa%Ruh4_+~f|%rt{I5v*
zIX@F?|KJID56-ivb+PLo(9hn_CdK{irOcL15>JNQFY112^$+}JPyI{uQ~$&E*=ri;
z`d^fH?4f=8vKHT4!p9O*fX(brB75Y9?e>T9=X#Fc@V#%@5^)~#zu5I(=>LQA-EGTS
zecy*#6gG+8lapch#Hh%vl(+}J;Q!hC1OKoo;#h3#V%5Js)tQ)|>pTT@1ojd+F9Gey
zg`B)zm`|Mo%tH31<UKv~=W{;tJ>s4=<+`Pu|B3orXwNyIcNN>;fBkIj^X8P}RXhF=
zXQK1u5RLN7k#_Q(KznJrALtMM13!vhfr025ar?@-%{l|uWt@NEd<$~n><jfS>RQL{
z+o;->n)+~0tt(u|o_9h!T`%M8%)w2awpV9b*xz9Pl-daUJm3y-HT%xg`^mFd6LBeL
z!0~s;zEr)Bn9x)I(wx`;JVwvRcc^io2XX(Nn3vr3dgbrr@YJ?K3w18P*52^ieBCQP
z=Up1V$N2~5ppJHRTeY8QfM(7Yv&RG7oWJAy<l59ZkqbHxP9b+_2e(SqeV4yuK)@1s
z%lQX#-VwqX^njWV_Q$z9&VW$+qSn=+HB*x>v?c3g(29)P)u;_o&w|&)HGDIinXT~p
z3;S|e$=&Tek9Wn!`cdY+d-w@o`37}x{(hl>ykB|%9yB$CGdIcl7Z?d&lJ%}QHck77
zJPR%C+s2w1_Dl_pxu6$Zi!`HmoD-%7OD@7%lKLL^Ixd9VlRSW*o&$^iQ2z+}hTgH)
z#91TO#+jH<`w4L}XWOt(`gqM*uTUcky`O(mEyU|4dJoy6*UZJ7%*}ajuos%~>&P2j
zk23f5<@GeV?(?`l=ih+D8t`d72xrUjv0wsg;%s1@*2p?TQ;n2$pV7h?_T%sL>iL@w
zZ{lmc<|B7!e&o!zs6RW+u8+aDyUdG>ZS(v&rT$QVymB7sEC@VsK1dg^3F@K90-wYB
zX!we79q<?(Wh~izEdPF0&->x`(6LA>F$~{{xE8-3Wzyfe`+Lsce(?uj{k@lb9<ViF
zY+O(5$+i4C_V5c{<+16E=ROu{Q$6GPT4S6q&{_K5u_V`@ycX##{0*QmV{dZ2nCqY;
zA?8S4GZ*)9&c3dbWAVLjyN70I=SO__U;F#l<Io(a5C3z2A@tzemRqUwLt}5+d-0(~
z@9;OFU}KNoe$TIui>7YTJt#>l*Z&LyKX@zjmu?UJC9w~;|NsB{%7G}y*uNDBxirfC
EKbET!0{{R3

literal 0
HcmV?d00001

diff --git a/templates/remix/remix.config.js b/templates/classic-remix-compiler/remix/remix.config.js
similarity index 100%
rename from templates/remix/remix.config.js
rename to templates/classic-remix-compiler/remix/remix.config.js
diff --git a/templates/remix/remix.env.d.ts b/templates/classic-remix-compiler/remix/remix.env.d.ts
similarity index 100%
rename from templates/remix/remix.env.d.ts
rename to templates/classic-remix-compiler/remix/remix.env.d.ts
diff --git a/templates/classic-remix-compiler/remix/tsconfig.json b/templates/classic-remix-compiler/remix/tsconfig.json
new file mode 100644
index 00000000000..7edc18b084a
--- /dev/null
+++ b/templates/classic-remix-compiler/remix/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],
+  "compilerOptions": {
+    "lib": ["DOM", "DOM.Iterable", "ES2022"],
+    "isolatedModules": true,
+    "esModuleInterop": true,
+    "jsx": "react-jsx",
+    "moduleResolution": "Bundler",
+    "resolveJsonModule": true,
+    "target": "ES2022",
+    "strict": true,
+    "allowJs": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "baseUrl": ".",
+    "paths": {
+      "~/*": ["./app/*"]
+    },
+
+    // Remix takes care of building everything in `remix build`.
+    "noEmit": true
+  }
+}
diff --git a/templates/cloudflare/.eslintrc.cjs b/templates/cloudflare/.eslintrc.cjs
new file mode 100644
index 00000000000..c3128a897c8
--- /dev/null
+++ b/templates/cloudflare/.eslintrc.cjs
@@ -0,0 +1,83 @@
+/**
+ * This is intended to be a basic starting point for linting in your app.
+ * It relies on recommended configs out of the box for simplicity, but you can
+ * and should modify this configuration to best suit your team's needs.
+ */
+
+/** @type {import('eslint').Linter.Config} */
+module.exports = {
+  root: true,
+  parserOptions: {
+    ecmaVersion: "latest",
+    sourceType: "module",
+    ecmaFeatures: {
+      jsx: true,
+    },
+  },
+  env: {
+    browser: true,
+    commonjs: true,
+    es6: true,
+  },
+
+  // Base config
+  extends: ["eslint:recommended"],
+
+  overrides: [
+    // React
+    {
+      files: ["**/*.{js,jsx,ts,tsx}"],
+      plugins: ["react", "jsx-a11y"],
+      extends: [
+        "plugin:react/recommended",
+        "plugin:react/jsx-runtime",
+        "plugin:react-hooks/recommended",
+        "plugin:jsx-a11y/recommended",
+      ],
+      settings: {
+        react: {
+          version: "detect",
+        },
+        formComponents: ["Form"],
+        linkComponents: [
+          { name: "Link", linkAttribute: "to" },
+          { name: "NavLink", linkAttribute: "to" },
+        ],
+        "import/resolver": {
+          typescript: {},
+        },
+      },
+    },
+
+    // Typescript
+    {
+      files: ["**/*.{ts,tsx}"],
+      plugins: ["@typescript-eslint", "import"],
+      parser: "@typescript-eslint/parser",
+      settings: {
+        "import/internal-regex": "^~/",
+        "import/resolver": {
+          node: {
+            extensions: [".ts", ".tsx"],
+          },
+          typescript: {
+            alwaysTryTypes: true,
+          },
+        },
+      },
+      extends: [
+        "plugin:@typescript-eslint/recommended",
+        "plugin:import/recommended",
+        "plugin:import/typescript",
+      ],
+    },
+
+    // Node
+    {
+      files: [".eslintrc.cjs"],
+      env: {
+        node: true,
+      },
+    },
+  ],
+};
diff --git a/templates/vite-cloudflare/.gitignore b/templates/cloudflare/.gitignore
similarity index 100%
rename from templates/vite-cloudflare/.gitignore
rename to templates/cloudflare/.gitignore
diff --git a/templates/vite-cloudflare/README.md b/templates/cloudflare/README.md
similarity index 100%
rename from templates/vite-cloudflare/README.md
rename to templates/cloudflare/README.md
diff --git a/templates/cloudflare/app/entry.client.tsx b/templates/cloudflare/app/entry.client.tsx
new file mode 100644
index 00000000000..94d5dc0de0f
--- /dev/null
+++ b/templates/cloudflare/app/entry.client.tsx
@@ -0,0 +1,18 @@
+/**
+ * By default, Remix will handle hydrating your app on the client for you.
+ * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨
+ * For more information, see https://remix.run/file-conventions/entry.client
+ */
+
+import { RemixBrowser } from "@remix-run/react";
+import { startTransition, StrictMode } from "react";
+import { hydrateRoot } from "react-dom/client";
+
+startTransition(() => {
+  hydrateRoot(
+    document,
+    <StrictMode>
+      <RemixBrowser />
+    </StrictMode>
+  );
+});
diff --git a/templates/vite-cloudflare/app/entry.server.tsx b/templates/cloudflare/app/entry.server.tsx
similarity index 100%
rename from templates/vite-cloudflare/app/entry.server.tsx
rename to templates/cloudflare/app/entry.server.tsx
diff --git a/templates/vite-cloudflare/app/root.tsx b/templates/cloudflare/app/root.tsx
similarity index 100%
rename from templates/vite-cloudflare/app/root.tsx
rename to templates/cloudflare/app/root.tsx
diff --git a/templates/vite-cloudflare/app/routes/_index.tsx b/templates/cloudflare/app/routes/_index.tsx
similarity index 100%
rename from templates/vite-cloudflare/app/routes/_index.tsx
rename to templates/cloudflare/app/routes/_index.tsx
diff --git a/templates/vite-cloudflare/functions/[[path]].ts b/templates/cloudflare/functions/[[path]].ts
similarity index 100%
rename from templates/vite-cloudflare/functions/[[path]].ts
rename to templates/cloudflare/functions/[[path]].ts
diff --git a/templates/vite-cloudflare/load-context.ts b/templates/cloudflare/load-context.ts
similarity index 100%
rename from templates/vite-cloudflare/load-context.ts
rename to templates/cloudflare/load-context.ts
diff --git a/templates/vite-cloudflare/package.json b/templates/cloudflare/package.json
similarity index 100%
rename from templates/vite-cloudflare/package.json
rename to templates/cloudflare/package.json
diff --git a/templates/cloudflare/public/favicon.ico b/templates/cloudflare/public/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..8830cf6821b354114848e6354889b8ecf6d2bc61
GIT binary patch
literal 16958
zcmeI3+jCXb9mnJN2h^uNlXH@jlam{_a8F3W{T}Wih>9YJpaf7TUbu)A5fv|h7OMfR
zR;q$lr&D!wv|c)`wcw1?>4QT1(&|jdsrI2h`Rn)dTW5t$8pz=s3_5L?#oBxAowe8R
z_WfPfN?F+@`q$D@rvC?(W!uWieppskmQ~YG*>*L?{img@tWpnYXZslxeh#TSUS3{q
z1Ju6JcfQSbQuORq69@YK(X-3c9vC2c2a2z~zw=F=50@pm0PUiCAm!bAT?2jpM`(^b
zC|2&Ngngt^<>oCv#<S!-dX;>?P(AZ`5_84x#QBPulix)TpkIAUp=(KgGo4CVS~Sxt
zVoR4>r5g9%bDh7hi0|v$={zr>CHd`?-l4^Ld(Z9PNz9piFY+llUw_x4ou7Vf-q%$g
z)&)J4>6Ft~RZ(uV>dJD<Ri@O+ttLaCvYPyTPWL>|`nxI1^x{X<kw8nThj+Y}tw{Or
zRjUv4hrU{KGhbGHm9Ho8JkC+BwU&#I{n0PFy7kVfbG?_+T+m-3nxQ?DUla7zinfMq
z%7#>@Z5S<=vf;V3w_(*O-7}W<=e$=}CB9_R;)m9)d7`d_xx+nl^Bg|%ew=?uoKO8w
zeQU7h;~8s!@9-k>7Cx}<bJ3N5)-UEEpLCvfc#RzR<`8{*xab{Oo3=4^71mT=VdDqW
z($=D$#(h&m+Q#bHD81KM6L?WCy3h+`$eLs0K9?!C`fS>1<o!{ao8ND$Pg}FkS7GCH
zJw}ah!*h61t2v#otd%vZ6+nN#?=TPYL0-^ar*$LiQFUQGZ9^+;N@Jx>SDQ7m(&miH
zs8!l*wOJ!GHbdh)pD--&W3+w`9YJ=;m^FtMY=`mTq8pyV!-@L6smwp3(q?G>=_4v^
zn(ikLue7!y70#2uhqUVpb7fp!=xu2{aM^1P^pts#+feZv8d~)2sf`sjXLQCEj;pdI
z%~f`JOO;*KnziMv^i_6+?mL?^wrE_&=IT9o1i!}Sd4Sx4O@w~1bi1)8<?^1W_hyQJ
z^TuRsvF7h=(){B?>(sXvYR-1?7~Zr<=SJ1Cw!i~yfi=4h6o3O~(-Sb2Ilwq%g$+V`
z>(C&N1!FV5rWF&iwt8~b)=jIn4b!XbrWrZgIHTISrdHcpjjx=TwJXI7_%Ks4oFLl9
zNT;!%!P4~xH85njXdfqgnIxIFOOKW`W$fxU%{{5wZkVF^G=JB$oUNU5dQSL&ZnR1s
z*ckJ$R`eCUJsWL>j6*+|2S1TL_J|Fl&kt=~XZF=+=iT0Xq1*KU-NuH%NAQff$LJp3
zU_*a;@7I0K{mqwux87~vwsp<}@P>KNDb}3U+6$rcZ114|QTMUSk+rhPA(b{$>pQTc
zIQri{+U>GMzsCy0Mo4BfWXJlkk;RhfpWpAB{=Rtr*d1MNC+H3Oi5+3D$gUI&AjV-1
z=0Z<L3zM*4u<g-e=|9$O^MnPHwN`w?DDl)WJ}-Op{;HO&ee}ljeagQt`n!MJWs7Ai
z;3B>Oox+bGyHe=yk-yu%=+{~&46C$ut^ZN+ysx$NH}*F43)3bKkMsxGyIl#>7Yb8W
zO{}&LUO8Ow{7>!bvSq?X{15&Y|4}0w2=o_^0ZzYgB+4HhZ4>s*mW&?RQ6&AY|CPcx
z$*LjftNS|H)ePYnIKNg{ck*|y7EJ&Co0ho0K`!{ENPkASeKy-JWE}dF_%}j)Z5a&q
zXAI2gPu6`s-@baW=*+keiE$A<b_MR?C-5PseqT8KkKDY(u92UZE4^yfJYZmLRl0Qj
z2mi$bu(VF|VOOk`m}JGAX2-zC@9eU}cdfT)cCWW1_iV7|_H3}{?+yJCT{HgFuJ!hW
z-dneDylkh+V;A%t9|&GGNe?DVALeWQ(D9>LIs5G6_X_6kgKK8n3jH2-H9`6bo)Qn1
zZ2x)xPt1=`9V|bE4*;j9$X20+xQCc$rEK<k`Fi~Hjq>|9OwH-O+Q*k`ZNw}K##SkY
z3u}aCV%V|j@!gL5(*5fuWo>JFjeU9Qqk`$bdwH8(qZovE2tA7WUpoCE=VKm^eZ|vZ
z(k<+j*mGJVah>8CkAsMD6#I$RtF;#57Wi`c_^k5?+KCmX$;Ky2*6<J=fcB~4B|ZV&
z?~?BCTu@_QfA&ei^lx3%=--_q{3EVljTZ#}J^n$D1~~>|Q^bJ8+s%2MB}OH-g$Ev^
zO3uqfGjuN%CZiu<`aCuKCh{kK!dDZ+<Fl~arF!o=>CcwgIeU2dsDfz+V>V3BDb~)~
zO!2l!_)m;ZepR~sL+-~s<YrF4FaR4!(myY+152d8&=KNvctHGLWgQw{tVX<yoWW_Z
zj-Hr!ndH7odVllGob8-nW3NBFv0(bY`1FL^9N&SL;FHHcq95!k&HtnS;-hG%hCy5j
z26`MMf5rEpW07<ly2*EzOXtyjasql9V^`87BWQ&$%XE#tlN;dgHVN~f{lTSm_O}mT
zE0})bgjJdY-h#`-)Z`P?PD;&z;T?03pC|DTyTxXaAF{>HS7;5ZB|~uUM&&5vDda2b
z)CW8S6GI*oF><|ZeY5D^+Mcsri)!tmrM33qvwI4r9o@(GlW!u2R>>sB|E#%W`c*@5
z|0iA|`{6aA7D4Q?vc1{vT-#yytn07`H!QIO^1+X7?zG3%y0<K~L$`F=p)E9B=Nsdp
zb=qM)|Jkjbc68S&dsX^=;-v%j)u|KbMf(>gPdIPUJ#s*DNAwd}m1_IMN1^T&be~+E
z_z%1W^9~dl|Me9U6+3oNyuMDkF*z_;dOG(Baa*yq;TRiw{EO~O_S6>e*L(+Cdu(TM
z@o%xTCV%hi&p)x3_inIF!b|W4|AF5p?y1j)cr9RG@v%QVaN8&LaorC-kJz_ExfVHB
za!mtuee#Vb?dh&bwrfGHYAiX&&|v$}U*UBM;#F!N=x>x|G5s0zOa9{(`=k4v^6iK3
z8d&=O@xhDs{;v7<i<J%blPl`%F2zV2g`fBkaG1Pogz882RUuz5)%QjDQ|qVROU;s)
z&2zMiK!4P)&yT-qFYjDtyBF5F{*y1vPxwCS6y&Rpe_)teF|v>JQ%eO;!Bt`&*MH&d
zp^K#dkq;jnJz%%bsqwlaKA5<gd^+Mkxi7IxDK-%BFT|4IAN4BoH1O}I%ID%*E>?fy
zS5JDbO#BgSAdi8<E3bcf{8u~%MEaSFm@4?cP}e`Oy}11ULi6hN?%l2f)C{Mn9*>NM
zDo2SifX6^Z;vn>cBh-?~r_n9qYvP|3ihrnqq6deS-#>l#dV4mX|G%L8|EL;$U+w69
z;rTK3FW$ewUfH|R-Z;3;jvpfiDm?Fvyu9PeR>wi|E8>&j2Z@2h`U}|$><c4e{h$1w
z{FfRq@#VNY57^%!w<Fg>2d`BPV3pz#ViIzH8v6pP^L-p!GbLv<;(p>}_6u&E6XO5-
zJ8JEvJ1)0>{iSd|kOQn#?0rTYL=KSmgMHCf$Qbm;7|8d(goD&T-~oCDuZf57iP#_Y
zmxaoOSjQsm*^u+m$L9AMqwi=6bpdiAY6k3akjGN{xOZ`_J<~Puyzpi7yhhKrLmXV;
z@ftONPy;Uw1F#{_fyGbk04yLE01v=i_5`RqQP+SUH0nb=O?l!J)qCSTdsbmjFJrTm
zx4^ef@qt{B+TV_OHOhtR?XT}1Etm(f21;#qyyW6FpnM+S7*M1iME?9fe8d-`Q#InN
z?^y{C_|8bxgUE@!o+Z72C)BrS&5D`gb-X8kq*1G7Uld-z19V}HY~mK#!o9MC-*#^+
znEsdc-|jj0+%cgBMy(cEkq4IQ1D*b;17Lyp>Utnsz%LRTfjQKL*vo(yJxwtw^)l|!
z7jhIDdtLB}m<l{aZcDUR3Vu-k+`XvA-r9dt!Sv$?zyM+)c*=UnSwkF9d<+EdBK`0Z
zOvSg<Db557lC(Q*`Yt{Kj07Xt>pkOIG&4@F+9cYkS5r%%jz}I0R#F4oBMf-|Jmmk*
zk^OEzF%}%5{a~kGYbFjV1n>HKC+a`;&-n*v_kD2DPP~n5(QE3C;30L<32GB*qV2z$
zWR1Kh=^1-q)P37WS6YWKlUSDe=eD^u_CV+P)q!3^{=$#b^auG<yDY{2eGgE&A8BtO
z4iN3=GdAq!6NGK#1^8e5z+BOTJyYw8ZN6Vq<F5*1vQvB~xg>S7m8zFfFS<>(e~)TG
z&uwWhSoetoe!1^<uYo6XVYh$jYq2>%)O}=6{SUcw-UQmw+i8lokRASPsbT=H|4D|(
zk^P7>TUEFho!3qXSWn$<jp767-aNC~whQ<7bkx~XU6anc7IYxL2j=)Mxg_x)9qvoF
z`x}FAA^ubCS9(wUhmE&MfARUmoSgHZc6;O0te<(<Bs#F)Ewf{<YvCDVx6mZtTa~xm
zriQQIAzi=kic!|RagNu)PQFvP&x`TjzqMDed4BN!oRJwP`eO||`2Qm5kC>m2{lHXw
zD>eN6-;wwq9(?@f^F4L2Ny5_6!d~iiA^s~(|B*lbZir-$&%)l>%Q(36yOIAu|326K
ztmBWz|MLA{Kj(H_{w2gd*nZ6a@ma(w==~EHIscEk|C=NGJa%Ruh4_+~f|%rt{I5v*
zIX@F?|KJID56-ivb+PLo(9hn_CdK{irOcL15>JNQFY112^$+}JPyI{uQ~$&E*=ri;
z`d^fH?4f=8vKHT4!p9O*fX(brB75Y9?e>T9=X#Fc@V#%@5^)~#zu5I(=>LQA-EGTS
zecy*#6gG+8lapch#Hh%vl(+}J;Q!hC1OKoo;#h3#V%5Js)tQ)|>pTT@1ojd+F9Gey
zg`B)zm`|Mo%tH31<UKv~=W{;tJ>s4=<+`Pu|B3orXwNyIcNN>;fBkIj^X8P}RXhF=
zXQK1u5RLN7k#_Q(KznJrALtMM13!vhfr025ar?@-%{l|uWt@NEd<$~n><jfS>RQL{
z+o;->n)+~0tt(u|o_9h!T`%M8%)w2awpV9b*xz9Pl-daUJm3y-HT%xg`^mFd6LBeL
z!0~s;zEr)Bn9x)I(wx`;JVwvRcc^io2XX(Nn3vr3dgbrr@YJ?K3w18P*52^ieBCQP
z=Up1V$N2~5ppJHRTeY8QfM(7Yv&RG7oWJAy<l59ZkqbHxP9b+_2e(SqeV4yuK)@1s
z%lQX#-VwqX^njWV_Q$z9&VW$+qSn=+HB*x>v?c3g(29)P)u;_o&w|&)HGDIinXT~p
z3;S|e$=&Tek9Wn!`cdY+d-w@o`37}x{(hl>ykB|%9yB$CGdIcl7Z?d&lJ%}QHck77
zJPR%C+s2w1_Dl_pxu6$Zi!`HmoD-%7OD@7%lKLL^Ixd9VlRSW*o&$^iQ2z+}hTgH)
z#91TO#+jH<`w4L}XWOt(`gqM*uTUcky`O(mEyU|4dJoy6*UZJ7%*}ajuos%~>&P2j
zk23f5<@GeV?(?`l=ih+D8t`d72xrUjv0wsg;%s1@*2p?TQ;n2$pV7h?_T%sL>iL@w
zZ{lmc<|B7!e&o!zs6RW+u8+aDyUdG>ZS(v&rT$QVymB7sEC@VsK1dg^3F@K90-wYB
zX!we79q<?(Wh~izEdPF0&->x`(6LA>F$~{{xE8-3Wzyfe`+Lsce(?uj{k@lb9<ViF
zY+O(5$+i4C_V5c{<+16E=ROu{Q$6GPT4S6q&{_K5u_V`@ycX##{0*QmV{dZ2nCqY;
zA?8S4GZ*)9&c3dbWAVLjyN70I=SO__U;F#l<Io(a5C3z2A@tzemRqUwLt}5+d-0(~
z@9;OFU}KNoe$TIui>7YTJt#>l*Z&LyKX@zjmu?UJC9w~;|NsB{%7G}y*uNDBxirfC
EKbET!0{{R3

literal 0
HcmV?d00001

diff --git a/templates/vite-cloudflare/tsconfig.json b/templates/cloudflare/tsconfig.json
similarity index 100%
rename from templates/vite-cloudflare/tsconfig.json
rename to templates/cloudflare/tsconfig.json
diff --git a/templates/vite-cloudflare/vite.config.ts b/templates/cloudflare/vite.config.ts
similarity index 100%
rename from templates/vite-cloudflare/vite.config.ts
rename to templates/cloudflare/vite.config.ts
diff --git a/templates/express/.gitignore b/templates/express/.gitignore
index 3f7bf98da3e..80ec311f4ff 100644
--- a/templates/express/.gitignore
+++ b/templates/express/.gitignore
@@ -2,5 +2,4 @@ node_modules
 
 /.cache
 /build
-/public/build
 .env
diff --git a/templates/express/README.md b/templates/express/README.md
index 4f569a53864..ec619a8eb45 100644
--- a/templates/express/README.md
+++ b/templates/express/README.md
@@ -1,17 +1,15 @@
-# Welcome to Remix!
+# Welcome to Remix + Vite!
 
-- [Remix Docs](https://remix.run/docs)
+📖 See the [Remix docs](https://remix.run/docs) and the [Remix Vite docs](https://remix.run/docs/en/main/future/vite) for details on supported features.
 
 ## Development
 
-Start the Remix development asset server and the Express server by running:
+Run the Express server with Vite dev middleware:
 
-```sh
+```shellscript
 npm run dev
 ```
 
-This starts your app in development mode, which will purge the server require cache when Remix rebuilds assets so you don't need a process manager restarting the express server.
-
 ## Deployment
 
 First, build your app for production:
@@ -30,7 +28,7 @@ Now you'll need to pick a host to deploy it to.
 
 ### DIY
 
-If you're familiar with deploying express applications you should be right at home just make sure to deploy the output of `remix build`
+If you're familiar with deploying Express applications you should be right at home. Just make sure to deploy the output of `npm run build`
 
-- `build/`
-- `public/build/`
+- `build/server`
+- `build/client`
diff --git a/templates/express/app/root.tsx b/templates/express/app/root.tsx
index b46b8fb15bc..e82f26fd179 100644
--- a/templates/express/app/root.tsx
+++ b/templates/express/app/root.tsx
@@ -1,19 +1,12 @@
-import { cssBundleHref } from "@remix-run/css-bundle";
-import type { LinksFunction } from "@remix-run/node";
 import {
   Links,
-  LiveReload,
   Meta,
   Outlet,
   Scripts,
   ScrollRestoration,
 } from "@remix-run/react";
 
-export const links: LinksFunction = () => [
-  ...(cssBundleHref ? [{ rel: "stylesheet", href: cssBundleHref }] : []),
-];
-
-export default function App() {
+export function Layout({ children }: { children: React.ReactNode }) {
   return (
     <html lang="en">
       <head>
@@ -23,11 +16,14 @@ export default function App() {
         <Links />
       </head>
       <body>
-        <Outlet />
+        {children}
         <ScrollRestoration />
         <Scripts />
-        <LiveReload />
       </body>
     </html>
   );
 }
+
+export default function App() {
+  return <Outlet />;
+}
diff --git a/templates/express/package.json b/templates/express/package.json
index a619d61844b..a6905c117b6 100644
--- a/templates/express/package.json
+++ b/templates/express/package.json
@@ -3,44 +3,42 @@
   "sideEffects": false,
   "type": "module",
   "scripts": {
-    "build": "remix build",
-    "dev": "remix dev --manual -c \"node --watch-path server.js --watch server.js\"",
+    "build": "remix vite:build",
+    "dev": "node ./server.js",
     "lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
     "start": "cross-env NODE_ENV=production node ./server.js",
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/css-bundle": "*",
     "@remix-run/express": "*",
     "@remix-run/node": "*",
     "@remix-run/react": "*",
     "compression": "^1.7.4",
-    "cross-env": "^7.0.3",
     "express": "^4.18.2",
     "isbot": "^4.1.0",
     "morgan": "^1.10.0",
     "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "source-map-support": "^0.5.21"
+    "react-dom": "^18.2.0"
   },
   "devDependencies": {
     "@remix-run/dev": "*",
-    "@types/compression": "^1.7.2",
-    "@types/express": "^4.17.17",
-    "@types/morgan": "^1.9.4",
+    "@types/compression": "^1.7.5",
+    "@types/express": "^4.17.20",
+    "@types/morgan": "^1.9.9",
     "@types/react": "^18.2.20",
     "@types/react-dom": "^18.2.7",
-    "@types/source-map-support": "^0.5.6",
     "@typescript-eslint/eslint-plugin": "^6.7.4",
     "@typescript-eslint/parser": "^6.7.4",
-    "chokidar": "^3.5.3",
+    "cross-env": "^7.0.3",
     "eslint": "^8.38.0",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-jsx-a11y": "^6.7.1",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "typescript": "^5.1.6"
+    "typescript": "^5.1.6",
+    "vite": "^5.1.0",
+    "vite-tsconfig-paths": "^4.2.1"
   },
   "engines": {
     "node": ">=18.0.0"
diff --git a/templates/express/server.js b/templates/express/server.js
index 38406cef874..43311cf691c 100644
--- a/templates/express/server.js
+++ b/templates/express/server.js
@@ -1,42 +1,25 @@
-import * as fs from "node:fs";
-import * as path from "node:path";
-import * as url from "node:url";
-
 import { createRequestHandler } from "@remix-run/express";
-import { broadcastDevReady, installGlobals } from "@remix-run/node";
+import { installGlobals } from "@remix-run/node";
 import compression from "compression";
 import express from "express";
 import morgan from "morgan";
-import sourceMapSupport from "source-map-support";
 
-sourceMapSupport.install({
-  retrieveSourceMap: function (source) {
-    const match = source.startsWith("file://");
-    if (match) {
-      const filePath = url.fileURLToPath(source);
-      const sourceMapPath = `${filePath}.map`;
-      if (fs.existsSync(sourceMapPath)) {
-        return {
-          url: source,
-          map: fs.readFileSync(sourceMapPath, "utf8"),
-        };
-      }
-    }
-    return null;
-  },
-});
 installGlobals();
 
-/** @typedef {import('@remix-run/node').ServerBuild} ServerBuild */
-
-const BUILD_PATH = path.resolve("build/index.js");
-const VERSION_PATH = path.resolve("build/version.txt");
-
-const initialBuild = await reimportServer();
-const remixHandler =
-  process.env.NODE_ENV === "development"
-    ? await createDevRequestHandler(initialBuild)
-    : createRequestHandler({ build: initialBuild });
+const viteDevServer =
+  process.env.NODE_ENV === "production"
+    ? undefined
+    : await import("vite").then((vite) =>
+        vite.createServer({
+          server: { middlewareMode: true },
+        })
+      );
+
+const remixHandler = createRequestHandler({
+  build: viteDevServer
+    ? () => viteDevServer.ssrLoadModule("virtual:remix/server-build")
+    : await import("./build/server/index.js"),
+});
 
 const app = express();
 
@@ -45,69 +28,27 @@ app.use(compression());
 // http://expressjs.com/en/advanced/best-practice-security.html#at-a-minimum-disable-x-powered-by-header
 app.disable("x-powered-by");
 
-// Remix fingerprints its assets so we can cache forever.
-app.use(
-  "/build",
-  express.static("public/build", { immutable: true, maxAge: "1y" })
-);
+// handle asset requests
+if (viteDevServer) {
+  app.use(viteDevServer.middlewares);
+} else {
+  // Vite fingerprints its assets so we can cache forever.
+  app.use(
+    "/assets",
+    express.static("build/client/assets", { immutable: true, maxAge: "1y" })
+  );
+}
 
 // Everything else (like favicon.ico) is cached for an hour. You may want to be
 // more aggressive with this caching.
-app.use(express.static("public", { maxAge: "1h" }));
+app.use(express.static("build/client", { maxAge: "1h" }));
 
 app.use(morgan("tiny"));
 
+// handle SSR requests
 app.all("*", remixHandler);
 
 const port = process.env.PORT || 3000;
-app.listen(port, async () => {
-  console.log(`Express server listening at http://localhost:${port}`);
-
-  if (process.env.NODE_ENV === "development") {
-    broadcastDevReady(initialBuild);
-  }
-});
-
-/**
- * @returns {Promise<ServerBuild>}
- */
-async function reimportServer() {
-  const stat = fs.statSync(BUILD_PATH);
-
-  // convert build path to URL for Windows compatibility with dynamic `import`
-  const BUILD_URL = url.pathToFileURL(BUILD_PATH).href;
-
-  // use a timestamp query parameter to bust the import cache
-  return import(BUILD_URL + "?t=" + stat.mtimeMs);
-}
-
-/**
- * @param {ServerBuild} initialBuild
- * @returns {Promise<import('@remix-run/express').RequestHandler>}
- */
-async function createDevRequestHandler(initialBuild) {
-  let build = initialBuild;
-  async function handleServerUpdate() {
-    // 1. re-import the server build
-    build = await reimportServer();
-    // 2. tell Remix that this app server is now up-to-date and ready
-    broadcastDevReady(build);
-  }
-  const chokidar = await import("chokidar");
-  chokidar
-    .watch(VERSION_PATH, { ignoreInitial: true })
-    .on("add", handleServerUpdate)
-    .on("change", handleServerUpdate);
-
-  // wrap request handler to make sure its recreated with the latest build for every request
-  return async (req, res, next) => {
-    try {
-      return createRequestHandler({
-        build,
-        mode: "development",
-      })(req, res, next);
-    } catch (error) {
-      next(error);
-    }
-  };
-}
+app.listen(port, () =>
+  console.log(`Express server listening at http://localhost:${port}`)
+);
diff --git a/templates/express/tsconfig.json b/templates/express/tsconfig.json
index 7edc18b084a..9d87dd378f5 100644
--- a/templates/express/tsconfig.json
+++ b/templates/express/tsconfig.json
@@ -1,10 +1,19 @@
 {
-  "include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],
+  "include": [
+    "**/*.ts",
+    "**/*.tsx",
+    "**/.server/**/*.ts",
+    "**/.server/**/*.tsx",
+    "**/.client/**/*.ts",
+    "**/.client/**/*.tsx"
+  ],
   "compilerOptions": {
     "lib": ["DOM", "DOM.Iterable", "ES2022"],
+    "types": ["@remix-run/node", "vite/client"],
     "isolatedModules": true,
     "esModuleInterop": true,
     "jsx": "react-jsx",
+    "module": "ESNext",
     "moduleResolution": "Bundler",
     "resolveJsonModule": true,
     "target": "ES2022",
@@ -17,7 +26,7 @@
       "~/*": ["./app/*"]
     },
 
-    // Remix takes care of building everything in `remix build`.
+    // Vite takes care of building everything, not tsc.
     "noEmit": true
   }
 }
diff --git a/templates/vite-express/vite.config.ts b/templates/express/vite.config.ts
similarity index 100%
rename from templates/vite-express/vite.config.ts
rename to templates/express/vite.config.ts
diff --git a/templates/remix-javascript/.eslintrc.cjs b/templates/remix-javascript/.eslintrc.cjs
index 7c254f1ca5d..07ce6811453 100644
--- a/templates/remix-javascript/.eslintrc.cjs
+++ b/templates/remix-javascript/.eslintrc.cjs
@@ -24,8 +24,9 @@ module.exports = {
   extends: ["eslint:recommended"],
 
   overrides: [
+    // React
     {
-      files: ["**/*.{js,jsx}"],
+      files: ["**/*.{js,jsx,ts,tsx}"],
       plugins: ["react", "jsx-a11y"],
       extends: [
         "plugin:react/recommended",
@@ -43,6 +44,9 @@ module.exports = {
           { name: "NavLink", linkAttribute: "to" },
         ],
       },
+      rules: {
+        "react/prop-types": "off",
+      },
     },
 
     // Node
diff --git a/templates/remix-javascript/.gitignore b/templates/remix-javascript/.gitignore
index 3f7bf98da3e..80ec311f4ff 100644
--- a/templates/remix-javascript/.gitignore
+++ b/templates/remix-javascript/.gitignore
@@ -2,5 +2,4 @@ node_modules
 
 /.cache
 /build
-/public/build
 .env
diff --git a/templates/remix-javascript/README.md b/templates/remix-javascript/README.md
index da8d02ad77c..c05e097d923 100644
--- a/templates/remix-javascript/README.md
+++ b/templates/remix-javascript/README.md
@@ -1,17 +1,15 @@
-# Welcome to Remix!
+# Welcome to Remix + Vite!
 
-- [Remix Docs](https://remix.run/docs)
+📖 See the [Remix docs](https://remix.run/docs) and the [Remix Vite docs](https://remix.run/docs/en/main/future/vite) for details on supported features.
 
 ## Development
 
-From your terminal:
+Run the Vite dev server:
 
-```sh
+```shellscript
 npm run dev
 ```
 
-This starts your app in development mode, rebuilding assets on file changes.
-
 ## Deployment
 
 First, build your app for production:
@@ -30,9 +28,9 @@ Now you'll need to pick a host to deploy it to.
 
 ### DIY
 
-If you're familiar with deploying node applications, the built-in Remix app server is production-ready.
+If you're familiar with deploying Node applications, the built-in Remix app server is production-ready.
 
-Make sure to deploy the output of `remix build`
+Make sure to deploy the output of `npm run build`
 
-- `build/`
-- `public/build/`
+- `build/server`
+- `build/client`
diff --git a/templates/remix-javascript/app/entry.server.jsx b/templates/remix-javascript/app/entry.server.jsx
index 386849510c9..cfa6300a88c 100644
--- a/templates/remix-javascript/app/entry.server.jsx
+++ b/templates/remix-javascript/app/entry.server.jsx
@@ -17,7 +17,11 @@ export default function handleRequest(
   request,
   responseStatusCode,
   responseHeaders,
-  remixContext
+  remixContext,
+  // This is ignored so we can keep it in the template for visibility.  Feel
+  // free to delete this parameter in your app if you're not using it!
+  // eslint-disable-next-line no-unused-vars
+  loadContext,
 ) {
   return isbot(request.headers.get("user-agent") || "")
     ? handleBotRequest(
@@ -38,9 +42,10 @@ function handleBotRequest(
   request,
   responseStatusCode,
   responseHeaders,
-  remixContext
+  remixContext,
 ) {
   return new Promise((resolve, reject) => {
+    let shellRendered = false;
     const { pipe, abort } = renderToPipeableStream(
       <RemixServer
         context={remixContext}
@@ -49,6 +54,7 @@ function handleBotRequest(
       />,
       {
         onAllReady() {
+          shellRendered = true;
           const body = new PassThrough();
           const stream = createReadableStreamFromReadable(body);
 
@@ -68,7 +74,12 @@ function handleBotRequest(
         },
         onError(error) {
           responseStatusCode = 500;
-          console.error(error);
+          // Log streaming rendering errors from inside the shell.  Don't log
+          // errors encountered during initial shell rendering since they'll
+          // reject and get logged in handleDocumentRequest.
+          if (shellRendered) {
+            console.error(error);
+          }
         },
       }
     );
@@ -81,9 +92,10 @@ function handleBrowserRequest(
   request,
   responseStatusCode,
   responseHeaders,
-  remixContext
+  remixContext,
 ) {
   return new Promise((resolve, reject) => {
+    let shellRendered = false;
     const { pipe, abort } = renderToPipeableStream(
       <RemixServer
         context={remixContext}
@@ -92,6 +104,7 @@ function handleBrowserRequest(
       />,
       {
         onShellReady() {
+          shellRendered = true;
           const body = new PassThrough();
           const stream = createReadableStreamFromReadable(body);
 
@@ -110,8 +123,13 @@ function handleBrowserRequest(
           reject(error);
         },
         onError(error) {
-          console.error(error);
           responseStatusCode = 500;
+          // Log streaming rendering errors from inside the shell.  Don't log
+          // errors encountered during initial shell rendering since they'll
+          // reject and get logged in handleDocumentRequest.
+          if (shellRendered) {
+            console.error(error);
+          }
         },
       }
     );
diff --git a/templates/remix-javascript/app/root.jsx b/templates/remix-javascript/app/root.jsx
index b2badce9519..7caa08bce7f 100644
--- a/templates/remix-javascript/app/root.jsx
+++ b/templates/remix-javascript/app/root.jsx
@@ -1,18 +1,12 @@
-import { cssBundleHref } from "@remix-run/css-bundle";
 import {
   Links,
-  LiveReload,
   Meta,
   Outlet,
   Scripts,
   ScrollRestoration,
 } from "@remix-run/react";
 
-export const links = () => [
-  ...(cssBundleHref ? [{ rel: "stylesheet", href: cssBundleHref }] : []),
-];
-
-export default function App() {
+export function Layout({ children }) {
   return (
     <html lang="en">
       <head>
@@ -22,11 +16,14 @@ export default function App() {
         <Links />
       </head>
       <body>
-        <Outlet />
+        {children}
         <ScrollRestoration />
         <Scripts />
-        <LiveReload />
       </body>
     </html>
   );
 }
+
+export default function App() {
+  return <Outlet />;
+}
diff --git a/templates/remix-javascript/app/routes/_index.jsx b/templates/remix-javascript/app/routes/_index.jsx
index cb1687bc50c..421509a4f34 100644
--- a/templates/remix-javascript/app/routes/_index.jsx
+++ b/templates/remix-javascript/app/routes/_index.jsx
@@ -1,10 +1,13 @@
 export const meta = () => {
-  return [{ title: "New Remix App" }];
+  return [
+    { title: "New Remix App" },
+    { name: "description", content: "Welcome to Remix!" },
+  ];
 };
 
 export default function Index() {
   return (
-    <div style={{ fontFamily: "system-ui, sans-serif", lineHeight: "1.4" }}>
+    <div style={{ fontFamily: "system-ui, sans-serif", lineHeight: "1.8" }}>
       <h1>Welcome to Remix</h1>
       <ul>
         <li>
diff --git a/templates/remix-javascript/package.json b/templates/remix-javascript/package.json
index 6b614da37d0..eb9727cda4c 100644
--- a/templates/remix-javascript/package.json
+++ b/templates/remix-javascript/package.json
@@ -3,13 +3,12 @@
   "sideEffects": false,
   "type": "module",
   "scripts": {
-    "build": "remix build",
-    "dev": "remix dev --manual",
+    "build": "remix vite:build",
+    "dev": "remix vite:dev",
     "lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
-    "start": "remix-serve ./build/index.js"
+    "start": "remix-serve ./build/server/index.js"
   },
   "dependencies": {
-    "@remix-run/css-bundle": "*",
     "@remix-run/node": "*",
     "@remix-run/react": "*",
     "@remix-run/serve": "*",
@@ -20,9 +19,11 @@
   "devDependencies": {
     "@remix-run/dev": "*",
     "eslint": "^8.38.0",
+    "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-jsx-a11y": "^6.7.1",
     "eslint-plugin-react": "^7.33.2",
-    "eslint-plugin-react-hooks": "^4.6.0"
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "vite": "^5.1.0"
   },
   "engines": {
     "node": ">=18.0.0"
diff --git a/templates/remix-javascript/vite.config.js b/templates/remix-javascript/vite.config.js
new file mode 100644
index 00000000000..2b6aff98727
--- /dev/null
+++ b/templates/remix-javascript/vite.config.js
@@ -0,0 +1,10 @@
+import { vitePlugin as remix } from "@remix-run/dev";
+import { installGlobals } from "@remix-run/node";
+import { defineConfig } from "vite";
+import tsconfigPaths from "vite-tsconfig-paths";
+
+installGlobals();
+
+export default defineConfig({
+  plugins: [remix(), tsconfigPaths()],
+});
diff --git a/templates/remix/.gitignore b/templates/remix/.gitignore
index 3f7bf98da3e..80ec311f4ff 100644
--- a/templates/remix/.gitignore
+++ b/templates/remix/.gitignore
@@ -2,5 +2,4 @@ node_modules
 
 /.cache
 /build
-/public/build
 .env
diff --git a/templates/remix/README.md b/templates/remix/README.md
index da8d02ad77c..c05e097d923 100644
--- a/templates/remix/README.md
+++ b/templates/remix/README.md
@@ -1,17 +1,15 @@
-# Welcome to Remix!
+# Welcome to Remix + Vite!
 
-- [Remix Docs](https://remix.run/docs)
+📖 See the [Remix docs](https://remix.run/docs) and the [Remix Vite docs](https://remix.run/docs/en/main/future/vite) for details on supported features.
 
 ## Development
 
-From your terminal:
+Run the Vite dev server:
 
-```sh
+```shellscript
 npm run dev
 ```
 
-This starts your app in development mode, rebuilding assets on file changes.
-
 ## Deployment
 
 First, build your app for production:
@@ -30,9 +28,9 @@ Now you'll need to pick a host to deploy it to.
 
 ### DIY
 
-If you're familiar with deploying node applications, the built-in Remix app server is production-ready.
+If you're familiar with deploying Node applications, the built-in Remix app server is production-ready.
 
-Make sure to deploy the output of `remix build`
+Make sure to deploy the output of `npm run build`
 
-- `build/`
-- `public/build/`
+- `build/server`
+- `build/client`
diff --git a/templates/remix/app/root.tsx b/templates/remix/app/root.tsx
index b46b8fb15bc..e82f26fd179 100644
--- a/templates/remix/app/root.tsx
+++ b/templates/remix/app/root.tsx
@@ -1,19 +1,12 @@
-import { cssBundleHref } from "@remix-run/css-bundle";
-import type { LinksFunction } from "@remix-run/node";
 import {
   Links,
-  LiveReload,
   Meta,
   Outlet,
   Scripts,
   ScrollRestoration,
 } from "@remix-run/react";
 
-export const links: LinksFunction = () => [
-  ...(cssBundleHref ? [{ rel: "stylesheet", href: cssBundleHref }] : []),
-];
-
-export default function App() {
+export function Layout({ children }: { children: React.ReactNode }) {
   return (
     <html lang="en">
       <head>
@@ -23,11 +16,14 @@ export default function App() {
         <Links />
       </head>
       <body>
-        <Outlet />
+        {children}
         <ScrollRestoration />
         <Scripts />
-        <LiveReload />
       </body>
     </html>
   );
 }
+
+export default function App() {
+  return <Outlet />;
+}
diff --git a/templates/remix/package.json b/templates/remix/package.json
index 2a43dafd2b8..ba824c84d9c 100644
--- a/templates/remix/package.json
+++ b/templates/remix/package.json
@@ -3,14 +3,13 @@
   "sideEffects": false,
   "type": "module",
   "scripts": {
-    "build": "remix build",
-    "dev": "remix dev --manual",
+    "build": "remix vite:build",
+    "dev": "remix vite:dev",
     "lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
-    "start": "remix-serve ./build/index.js",
+    "start": "remix-serve ./build/server/index.js",
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/css-bundle": "*",
     "@remix-run/node": "*",
     "@remix-run/react": "*",
     "@remix-run/serve": "*",
@@ -30,7 +29,9 @@
     "eslint-plugin-jsx-a11y": "^6.7.1",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "typescript": "^5.1.6"
+    "typescript": "^5.1.6",
+    "vite": "^5.1.0",
+    "vite-tsconfig-paths": "^4.2.1"
   },
   "engines": {
     "node": ">=18.0.0"
diff --git a/templates/remix/tsconfig.json b/templates/remix/tsconfig.json
index 7edc18b084a..9d87dd378f5 100644
--- a/templates/remix/tsconfig.json
+++ b/templates/remix/tsconfig.json
@@ -1,10 +1,19 @@
 {
-  "include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],
+  "include": [
+    "**/*.ts",
+    "**/*.tsx",
+    "**/.server/**/*.ts",
+    "**/.server/**/*.tsx",
+    "**/.client/**/*.ts",
+    "**/.client/**/*.tsx"
+  ],
   "compilerOptions": {
     "lib": ["DOM", "DOM.Iterable", "ES2022"],
+    "types": ["@remix-run/node", "vite/client"],
     "isolatedModules": true,
     "esModuleInterop": true,
     "jsx": "react-jsx",
+    "module": "ESNext",
     "moduleResolution": "Bundler",
     "resolveJsonModule": true,
     "target": "ES2022",
@@ -17,7 +26,7 @@
       "~/*": ["./app/*"]
     },
 
-    // Remix takes care of building everything in `remix build`.
+    // Vite takes care of building everything, not tsc.
     "noEmit": true
   }
 }
diff --git a/templates/remix/vite.config.ts b/templates/remix/vite.config.ts
new file mode 100644
index 00000000000..2b6aff98727
--- /dev/null
+++ b/templates/remix/vite.config.ts
@@ -0,0 +1,10 @@
+import { vitePlugin as remix } from "@remix-run/dev";
+import { installGlobals } from "@remix-run/node";
+import { defineConfig } from "vite";
+import tsconfigPaths from "vite-tsconfig-paths";
+
+installGlobals();
+
+export default defineConfig({
+  plugins: [remix(), tsconfigPaths()],
+});
diff --git a/templates/vite-express/README.md b/templates/vite-express/README.md
deleted file mode 100644
index ec619a8eb45..00000000000
--- a/templates/vite-express/README.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# Welcome to Remix + Vite!
-
-📖 See the [Remix docs](https://remix.run/docs) and the [Remix Vite docs](https://remix.run/docs/en/main/future/vite) for details on supported features.
-
-## Development
-
-Run the Express server with Vite dev middleware:
-
-```shellscript
-npm run dev
-```
-
-## Deployment
-
-First, build your app for production:
-
-```sh
-npm run build
-```
-
-Then run the app in production mode:
-
-```sh
-npm start
-```
-
-Now you'll need to pick a host to deploy it to.
-
-### DIY
-
-If you're familiar with deploying Express applications you should be right at home. Just make sure to deploy the output of `npm run build`
-
-- `build/server`
-- `build/client`
diff --git a/templates/vite-express/server.js b/templates/vite-express/server.js
deleted file mode 100644
index 43311cf691c..00000000000
--- a/templates/vite-express/server.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import { createRequestHandler } from "@remix-run/express";
-import { installGlobals } from "@remix-run/node";
-import compression from "compression";
-import express from "express";
-import morgan from "morgan";
-
-installGlobals();
-
-const viteDevServer =
-  process.env.NODE_ENV === "production"
-    ? undefined
-    : await import("vite").then((vite) =>
-        vite.createServer({
-          server: { middlewareMode: true },
-        })
-      );
-
-const remixHandler = createRequestHandler({
-  build: viteDevServer
-    ? () => viteDevServer.ssrLoadModule("virtual:remix/server-build")
-    : await import("./build/server/index.js"),
-});
-
-const app = express();
-
-app.use(compression());
-
-// http://expressjs.com/en/advanced/best-practice-security.html#at-a-minimum-disable-x-powered-by-header
-app.disable("x-powered-by");
-
-// handle asset requests
-if (viteDevServer) {
-  app.use(viteDevServer.middlewares);
-} else {
-  // Vite fingerprints its assets so we can cache forever.
-  app.use(
-    "/assets",
-    express.static("build/client/assets", { immutable: true, maxAge: "1y" })
-  );
-}
-
-// Everything else (like favicon.ico) is cached for an hour. You may want to be
-// more aggressive with this caching.
-app.use(express.static("build/client", { maxAge: "1h" }));
-
-app.use(morgan("tiny"));
-
-// handle SSR requests
-app.all("*", remixHandler);
-
-const port = process.env.PORT || 3000;
-app.listen(port, () =>
-  console.log(`Express server listening at http://localhost:${port}`)
-);

From e1a98da17fa5477f07e7a78eaf50260f87fa8f55 Mon Sep 17 00:00:00 2001
From: Remix Run Bot <hello@remix.run>
Date: Tue, 19 Mar 2024 21:34:01 +0000
Subject: [PATCH 015/108] chore: format

---
 templates/classic-remix-compiler/deno/app/entry.client.tsx  | 2 +-
 templates/classic-remix-compiler/deno/app/entry.server.tsx  | 6 +++---
 templates/classic-remix-compiler/deno/app/routes/_index.tsx | 2 +-
 templates/remix-javascript/app/entry.server.jsx             | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/templates/classic-remix-compiler/deno/app/entry.client.tsx b/templates/classic-remix-compiler/deno/app/entry.client.tsx
index 612913289ec..94d5dc0de0f 100644
--- a/templates/classic-remix-compiler/deno/app/entry.client.tsx
+++ b/templates/classic-remix-compiler/deno/app/entry.client.tsx
@@ -13,6 +13,6 @@ startTransition(() => {
     document,
     <StrictMode>
       <RemixBrowser />
-    </StrictMode>,
+    </StrictMode>
   );
 });
diff --git a/templates/classic-remix-compiler/deno/app/entry.server.tsx b/templates/classic-remix-compiler/deno/app/entry.server.tsx
index 518f1283b50..dffa5491dae 100644
--- a/templates/classic-remix-compiler/deno/app/entry.server.tsx
+++ b/templates/classic-remix-compiler/deno/app/entry.server.tsx
@@ -16,8 +16,8 @@ export default async function handleRequest(
   remixContext: EntryContext,
   // This is ignored so we can keep it in the template for visibility.  Feel
   // free to delete this parameter in your app if you're not using it!
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  loadContext: AppLoadContext,
+   
+  loadContext: AppLoadContext
 ) {
   const body = await renderToReadableStream(
     <RemixServer context={remixContext} url={request.url} />,
@@ -28,7 +28,7 @@ export default async function handleRequest(
         console.error(error);
         responseStatusCode = 500;
       },
-    },
+    }
   );
 
   if (isbot(request.headers.get("user-agent") || "")) {
diff --git a/templates/classic-remix-compiler/deno/app/routes/_index.tsx b/templates/classic-remix-compiler/deno/app/routes/_index.tsx
index 2e62fab6222..f7d27bc9a4d 100644
--- a/templates/classic-remix-compiler/deno/app/routes/_index.tsx
+++ b/templates/classic-remix-compiler/deno/app/routes/_index.tsx
@@ -1,5 +1,5 @@
-import * as React from "react";
 import type { MetaFunction } from "@remix-run/deno";
+import * as React from "react";
 
 export const meta: MetaFunction = () => {
   return [
diff --git a/templates/remix-javascript/app/entry.server.jsx b/templates/remix-javascript/app/entry.server.jsx
index cfa6300a88c..aba88807a13 100644
--- a/templates/remix-javascript/app/entry.server.jsx
+++ b/templates/remix-javascript/app/entry.server.jsx
@@ -21,7 +21,7 @@ export default function handleRequest(
   // This is ignored so we can keep it in the template for visibility.  Feel
   // free to delete this parameter in your app if you're not using it!
   // eslint-disable-next-line no-unused-vars
-  loadContext,
+  loadContext
 ) {
   return isbot(request.headers.get("user-agent") || "")
     ? handleBotRequest(
@@ -42,7 +42,7 @@ function handleBotRequest(
   request,
   responseStatusCode,
   responseHeaders,
-  remixContext,
+  remixContext
 ) {
   return new Promise((resolve, reject) => {
     let shellRendered = false;
@@ -92,7 +92,7 @@ function handleBrowserRequest(
   request,
   responseStatusCode,
   responseHeaders,
-  remixContext,
+  remixContext
 ) {
   return new Promise((resolve, reject) => {
     let shellRendered = false;

From 9721951c059a8471ca51646f82aef66a52767e70 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Tue, 19 Mar 2024 17:39:58 -0400
Subject: [PATCH 016/108] Sync release-experimental.yml with dev version

---
 ...lease-experimental-dispatch.yml => release-experimental.yml} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename .github/workflows/{release-experimental-dispatch.yml => release-experimental.yml} (98%)

diff --git a/.github/workflows/release-experimental-dispatch.yml b/.github/workflows/release-experimental.yml
similarity index 98%
rename from .github/workflows/release-experimental-dispatch.yml
rename to .github/workflows/release-experimental.yml
index 5e636c792af..b165cd722f2 100644
--- a/.github/workflows/release-experimental-dispatch.yml
+++ b/.github/workflows/release-experimental.yml
@@ -56,4 +56,4 @@ jobs:
           echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ~/.npmrc
 
       - name: 🚀 Publish
-        run: npm run publish
+        run: pnpm run publish

From 012a430000c819ebd63f9618daa487bafe837ec9 Mon Sep 17 00:00:00 2001
From: Remix Run Bot <hello@remix.run>
Date: Tue, 19 Mar 2024 21:47:22 +0000
Subject: [PATCH 017/108] chore: format

---
 templates/classic-remix-compiler/deno/app/entry.server.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/classic-remix-compiler/deno/app/entry.server.tsx b/templates/classic-remix-compiler/deno/app/entry.server.tsx
index dffa5491dae..27f656dd448 100644
--- a/templates/classic-remix-compiler/deno/app/entry.server.tsx
+++ b/templates/classic-remix-compiler/deno/app/entry.server.tsx
@@ -16,7 +16,7 @@ export default async function handleRequest(
   remixContext: EntryContext,
   // This is ignored so we can keep it in the template for visibility.  Feel
   // free to delete this parameter in your app if you're not using it!
-   
+
   loadContext: AppLoadContext
 ) {
   const body = await renderToReadableStream(

From 047c96511c9b0d7fa3f4f3ff03ae3358e3fe2a2f Mon Sep 17 00:00:00 2001
From: Mark Dalgleish <mark.john.dalgleish@gmail.com>
Date: Wed, 20 Mar 2024 11:43:14 +1100
Subject: [PATCH 018/108] Remove vite-tsconfig-paths from remix-javascript
 template (#9088)

---
 templates/remix-javascript/vite.config.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/templates/remix-javascript/vite.config.js b/templates/remix-javascript/vite.config.js
index 2b6aff98727..d9753c5d2c2 100644
--- a/templates/remix-javascript/vite.config.js
+++ b/templates/remix-javascript/vite.config.js
@@ -1,10 +1,9 @@
 import { vitePlugin as remix } from "@remix-run/dev";
 import { installGlobals } from "@remix-run/node";
 import { defineConfig } from "vite";
-import tsconfigPaths from "vite-tsconfig-paths";
 
 installGlobals();
 
 export default defineConfig({
-  plugins: [remix(), tsconfigPaths()],
+  plugins: [remix()],
 });

From 9661da31e589fc4eda042ab2f6f963cefba380ed Mon Sep 17 00:00:00 2001
From: Ryan Florence <rpflorence@gmail.com>
Date: Tue, 19 Mar 2024 22:02:27 -0600
Subject: [PATCH 019/108] Update quickstart.md

maybe moving this directly below "installation" they won't miss it?
---
 docs/start/quickstart.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/start/quickstart.md b/docs/start/quickstart.md
index 5acb3b40b80..542de35ea9d 100644
--- a/docs/start/quickstart.md
+++ b/docs/start/quickstart.md
@@ -9,15 +9,15 @@ This guide will get you familiar with the basic plumbing required to run a Remix
 
 When you're ready to get serious about your Remix project, you might consider starting with a community template. They include TypeScript setups, databases, testing harnesses, authentication, and more. You can find a list of community templates on the [Remix Resources][templates] page.
 
+## Installation
+
 If you prefer to initialize a batteries-included Remix project, you can use the [`create-remix` CLI][create-remix]:
 
 ```shellscript nonumber
 npx create-remix@latest
 ```
 
-## Installation
-
-This guide will explain everything the CLI does to set up your project, and instead of using the CLI you can follow these steps. If you're just getting started with Remix, we recommend following this guide to understand all of the different pieces that make up a Remix app.
+However, this guide will explain everything the CLI does to set up your project, and instead of using the CLI you can follow these steps. If you're just getting started with Remix, we recommend following this guide to understand all of the different pieces that make up a Remix app.
 
 ```shellscript nonumber
 mkdir my-remix-app

From 964a94d3a257ee18aa0beb8c2e476519a9ab0768 Mon Sep 17 00:00:00 2001
From: Jacob Ebey <jacob.ebey@live.com>
Date: Thu, 21 Mar 2024 14:29:54 -0700
Subject: [PATCH 020/108] fix: handle net new redirects created by
 handleDataRequest (#9104)

---
 .changeset/odd-frogs-attend.md                |  5 ++
 .../__tests__/server-test.ts                  | 40 ++++++++++++++
 packages/remix-server-runtime/server.ts       | 55 ++++++++++++-------
 3 files changed, 79 insertions(+), 21 deletions(-)
 create mode 100644 .changeset/odd-frogs-attend.md

diff --git a/.changeset/odd-frogs-attend.md b/.changeset/odd-frogs-attend.md
new file mode 100644
index 00000000000..18907021cc2
--- /dev/null
+++ b/.changeset/odd-frogs-attend.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/server-runtime": patch
+---
+
+handle net new redirects created by handleDataRequest
diff --git a/packages/remix-server-runtime/__tests__/server-test.ts b/packages/remix-server-runtime/__tests__/server-test.ts
index a31e23e13d8..1195e4fdaf5 100644
--- a/packages/remix-server-runtime/__tests__/server-test.ts
+++ b/packages/remix-server-runtime/__tests__/server-test.ts
@@ -903,6 +903,46 @@ describe("shared server runtime", () => {
       expect(indexAction.mock.calls.length).toBe(1);
     });
 
+    test("data request handleDataRequest redirects are handled", async () => {
+      let rootLoader = jest.fn(() => {
+        return "root";
+      });
+      let indexLoader = jest.fn(() => {
+        return "index";
+      });
+      let build = mockServerBuild({
+        root: {
+          default: {},
+          loader: rootLoader,
+        },
+        "routes/_index": {
+          parentId: "root",
+          loader: indexLoader,
+          index: true,
+        },
+      });
+      build.entry.module.handleDataRequest.mockImplementation(async () => {
+        return new Response(null, {
+          status: 302,
+          headers: {
+            Location: "/redirect",
+          },
+        });
+      });
+      let handler = createRequestHandler(build, ServerMode.Test);
+
+      let request = new Request(`${baseUrl}/?_data=routes/_index`, {
+        method: "get",
+      });
+
+      let result = await handler(request);
+      expect(result.status).toBe(204);
+      expect(result.headers.get("X-Remix-Redirect")).toBe("/redirect");
+      expect(result.headers.get("X-Remix-Status")).toBe("302");
+      expect(rootLoader.mock.calls.length).toBe(0);
+      expect(indexLoader.mock.calls.length).toBe(1);
+    });
+
     test("aborts request", async () => {
       let rootLoader = jest.fn(() => {
         return "root";
diff --git a/packages/remix-server-runtime/server.ts b/packages/remix-server-runtime/server.ts
index b4f03e55640..ccf4c3e6ce4 100644
--- a/packages/remix-server-runtime/server.ts
+++ b/packages/remix-server-runtime/server.ts
@@ -151,6 +151,10 @@ export const createRequestHandler: CreateRequestHandlerFunction = (
           params,
           request,
         });
+
+        if (isRedirectResponse(response)) {
+          response = createRemixRedirectResponse(response, _build.basename);
+        }
       }
     } else if (
       _build.future.unstable_singleFetch &&
@@ -184,6 +188,10 @@ export const createRequestHandler: CreateRequestHandlerFunction = (
           params,
           request,
         });
+
+        if (isRedirectResponse(response)) {
+          response = createRemixRedirectResponse(response, _build.basename);
+        }
       }
     } else if (
       matches &&
@@ -243,27 +251,7 @@ async function handleDataRequest(
     });
 
     if (isRedirectResponse(response)) {
-      // We don't have any way to prevent a fetch request from following
-      // redirects. So we use the `X-Remix-Redirect` header to indicate the
-      // next URL, and then "follow" the redirect manually on the client.
-      let headers = new Headers(response.headers);
-      let redirectUrl = headers.get("Location")!;
-      headers.set(
-        "X-Remix-Redirect",
-        build.basename
-          ? stripBasename(redirectUrl, build.basename) || redirectUrl
-          : redirectUrl
-      );
-      headers.set("X-Remix-Status", response.status);
-      headers.delete("Location");
-      if (response.headers.get("Set-Cookie") !== null) {
-        headers.set("X-Remix-Revalidate", "yes");
-      }
-
-      return new Response(null, {
-        status: 204,
-        headers,
-      });
+      return createRemixRedirectResponse(response, build.basename);
     }
 
     if (DEFERRED_SYMBOL in response) {
@@ -848,3 +836,28 @@ function encodeViaTurboStream(
     ],
   });
 }
+
+function createRemixRedirectResponse(
+  response: Response,
+  basename: string | undefined
+) {
+  // We don't have any way to prevent a fetch request from following
+  // redirects. So we use the `X-Remix-Redirect` header to indicate the
+  // next URL, and then "follow" the redirect manually on the client.
+  let headers = new Headers(response.headers);
+  let redirectUrl = headers.get("Location")!;
+  headers.set(
+    "X-Remix-Redirect",
+    basename ? stripBasename(redirectUrl, basename) || redirectUrl : redirectUrl
+  );
+  headers.set("X-Remix-Status", String(response.status));
+  headers.delete("Location");
+  if (response.headers.get("Set-Cookie") !== null) {
+    headers.set("X-Remix-Revalidate", "yes");
+  }
+
+  return new Response(null, {
+    status: 204,
+    headers,
+  });
+}

From 71fbfc3ee375e24bdc74673ce77917b0bd55e4d6 Mon Sep 17 00:00:00 2001
From: Mark Dalgleish <mark.john.dalgleish@gmail.com>
Date: Fri, 22 Mar 2024 09:04:54 +1100
Subject: [PATCH 021/108] Add "CSS Files" guide (#9094)

---
 docs/guides/css-files.md | 170 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 170 insertions(+)
 create mode 100644 docs/guides/css-files.md

diff --git a/docs/guides/css-files.md b/docs/guides/css-files.md
new file mode 100644
index 00000000000..2d957bb7b24
--- /dev/null
+++ b/docs/guides/css-files.md
@@ -0,0 +1,170 @@
+---
+title: CSS Files
+---
+
+# CSS Files
+
+There are two main ways to manage CSS files in Remix:
+
+- [CSS bundling](#css-bundling)
+- [CSS URL imports](#css-url-imports)
+
+This guide covers the pros and cons of each approach, and provides some recommendations based on your project's specific needs.
+
+## CSS bundling
+
+CSS bundling is the most common approach for managing CSS files in the React community. In this model, styles are treated as module side effects and are bundled into one or more CSS files at the discretion of the bundler. It's simpler to use, requires less boilerplate, and gives the bundler more power to optimize the output.
+
+For example, let's say you have a basic `Button` component with some styles attached to it:
+
+```css filename=components/Button.css
+.Button__root {
+  background: blue;
+  color: white;
+}
+```
+
+```jsx filename=components/Button.jsx
+import "./Button.css";
+
+export function Button(props) {
+  return <button {...props} className="Button__root" />;
+}
+```
+
+To use this component, you can simply import it and use it in your route file:
+
+```jsx filename=routes/hello.jsx
+import { Button } from "../components/Button";
+
+export default function HelloRoute() {
+  return <Button>Hello!</Button>;
+}
+```
+
+When consuming this component, you don't have to worry about managing individual CSS files. CSS is treated as private implementation detail of the component. This is a common pattern in many component libraries and design systems and scales quite nicely.
+
+#### CSS bundling is required for some CSS solutions
+
+Some approaches to managing CSS files requires the use of bundled CSS.
+
+For example, [CSS Modules][css-modules] is built on the assumption that CSS is bundled. Even though you're explicitly importing the CSS file's class names as a JavaScript object, the styles themselves are still treated as a side effect and automatically bundled into the output. You have no access to the underlying URL of the CSS file.
+
+Another common use case where CSS bundling is required is when you're using a third-party component library that imports CSS files as side effects and relies on your bundler to handle them for you, such as [React Spectrum][react-spectrum].
+
+#### CSS order can differ between development and production
+
+CSS bundling comes with a notable trade-off when combined with Vite's approach to on-demand compilation.
+
+Using the `Button.css` example presented earlier, this CSS file will be transformed into the following JavaScript code during development:
+
+<!-- prettier-ignore-start -->
+
+<!-- eslint-skip -->
+
+```js
+import {createHotContext as __vite__createHotContext} from "/@vite/client";
+import.meta.hot = __vite__createHotContext("/app/components/Button.css");
+import {updateStyle as __vite__updateStyle, removeStyle as __vite__removeStyle} from "/@vite/client";
+const __vite__id = "/path/to/app/components/Button.css";
+const __vite__css = ".Button__root{background:blue;color:white;}"
+__vite__updateStyle(__vite__id, __vite__css);
+import.meta.hot.accept();
+import.meta.hot.prune(()=>__vite__removeStyle(__vite__id));
+```
+
+<!-- prettier-ignore-end -->
+
+It's worth stressing that this transformation only happens in development. **Production builds won't look like this** since static CSS files are generated.
+
+Vite does this so that CSS can be compiled lazily when imported and then hot reloaded during development. As soon as this file is imported, the CSS file's contents are injected into the page as a side effect.
+
+The downside of this approach is that these styles are not tied to the route lifecycle. This means that styles won't be unmounted when navigating away from the route, leading to a build-up of old styles in the document while navigating around the app. This can result in CSS rule order differing between development and production.
+
+To mitigate this, it's helpful to write your CSS in a way that makes it resilient against changes to file ordering. For example, you can use [CSS Modules][css-modules] to ensure that CSS files are scoped to the files that import them. You should also try to limit the number of CSS files that target a single element since the order of those files is not guaranteed.
+
+#### Bundled CSS can disappear in development
+
+Another notable tradeoff with Vite's approach to CSS bundling during development is that React can inadvertently remove styles from the document.
+
+When React is used to render the entire document (as Remix does) you can run into issues when elements are dynamically injected into the `head` element. If the document is re-mounted, the existing `head` element is removed and replaced with an entirely new one, removing any `style` elements that Vite injects during development.
+
+In Remix, this issue can happen due to hydration errors since it causes React to re-render the entire page from scratch. Hydration errors can be caused by your app code, but they can also be caused by browser extensions that manipulate the document.
+
+This is a known React issue that is fixed in their [canary release channel][react-canaries]. If you understand the risks involved, you can pin your app to a specific [React version][react-versions] and then use [package overrides][package-overrides] to ensure this is the only version of React used throughout your project. For example:
+
+```json filename=package.json
+{
+  "dependencies": {
+    "react": "18.3.0-canary-...",
+    "react-dom": "18.3.0-canary-..."
+  },
+  "overrides": {
+    "react": "18.3.0-canary-...",
+    "react-dom": "18.3.0-canary-..."
+  }
+}
+```
+
+<docs-info>For reference, this is how Next.js treats React versioning internally on your behalf, so this approach is more widely used than you might expect, even though it's not something Remix provides as a default.</docs-info>
+
+Again, it's worth stressing that this issue with styles that were injected by Vite only happens in development. **Production builds won't have this issue** since static CSS files are generated.
+
+## CSS URL Imports
+
+The other main way to manage CSS files is to use [Vite's explicit URL imports][vite-url-imports].
+
+Vite lets you append `?url` to your CSS file imports to get the URL of the file (e.g. `import href from "./styles.css?url"`). This URL can then be passed to Remix via the [links export][links-export] from route modules. This ties CSS files into Remix's routing lifecycle, ensuring styles are injected and removed from the document while navigating around the app.
+
+For example, using the same `Button` component example from earlier, you can export a `links` array alongside the component so that consumers have access to its styles.
+
+```jsx filename=components/Button.jsx lines=[1,3-5]
+import buttonCssUrl from "./Button.css?url";
+
+export const links = [
+  { rel: "stylesheet", href: buttonCssUrl },
+];
+
+export function Button(props) {
+  return <button {...props} className="Button__root" />;
+}
+```
+
+When importing this component, consumers now also need to import this `links` array and attach it to their route's `links` export:
+
+```jsx filename=routes/hello.jsx lines=[3,6]
+import {
+  Button,
+  links as buttonLinks,
+} from "../components/Button";
+
+export const links = [...buttonLinks];
+
+export default function HelloRoute() {
+  return <Button>Hello!</Button>;
+}
+```
+
+This approach is much more predictable in terms of rule ordering since it gives you granular control over each file and provides consistent behavior between development and production. As opposed to bundled CSS during development, styles are removed from the document when they are no longer needed. If the page's `head` element is ever re-mounted, any `link` tags defined by your routes will also be re-mounted since they are part of the React lifecycle.
+
+The downside of this approach is that it can result in a lot of boilerplate.
+
+If you have many re-usable components each with their own CSS file, you'll need to manually surface all `links` for each component up to your route components, which may require passing CSS URLs up through multiple levels of components. This can also be error prone since it's easy to forget to import a component's `links` array.
+
+Despite its advantages, you may find this to be too cumbersome compared to CSS bundling, or you may find the extra boilerplate to be worth it. There's no right or wrong on this one.
+
+## Conclusion
+
+It's ultimately personal preference when it comes to managing CSS files in your Remix application, but here's a good rule of thumb:
+
+- If your project only has a small number of CSS files (e.g. when using Tailwind, in which case you might only have a single CSS file), you should use CSS URL imports. The increased boilerplate is minimal and your development environment will be much closer to production.
+- If your project has a large number of CSS files tied to smaller re-usable components, you'll probably find the reduced boilerplate of CSS bundling to be much more ergonomic. Just be aware of the trade-offs and write your CSS in a way that makes it resilient against changes to file ordering.
+- If you're experiencing issues with styles disappearing during development, you should consider using a [React canary release][react-canaries] so that React doesn't remove the existing `head` element when re-mounting the page.
+
+[css-modules]: https://vitejs.dev/guide/features#css-modules
+[react-spectrum]: https://react-spectrum.adobe.com
+[react-canaries]: https://react.dev/blog/2023/05/03/react-canaries
+[react-versions]: https://www.npmjs.com/package/react?activeTab=versions
+[package-overrides]: https://docs.npmjs.com/cli/v10/configuring-npm/package-json#overrides
+[vite-url-imports]: https://vitejs.dev/guide/assets#explicit-url-imports
+[links-export]: ../route/links

From 5db21b9f912416db3bcd500cf249327af298b639 Mon Sep 17 00:00:00 2001
From: Remix Run Bot <hello@remix.run>
Date: Thu, 21 Mar 2024 22:06:38 +0000
Subject: [PATCH 022/108] chore: format

---
 docs/guides/css-files.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/guides/css-files.md b/docs/guides/css-files.md
index 2d957bb7b24..323a3fcb01f 100644
--- a/docs/guides/css-files.md
+++ b/docs/guides/css-files.md
@@ -6,8 +6,8 @@ title: CSS Files
 
 There are two main ways to manage CSS files in Remix:
 
-- [CSS bundling](#css-bundling)
-- [CSS URL imports](#css-url-imports)
+- [CSS bundling][css-bundling]
+- [CSS URL imports][css-url-imports]
 
 This guide covers the pros and cons of each approach, and provides some recommendations based on your project's specific needs.
 
@@ -168,3 +168,5 @@ It's ultimately personal preference when it comes to managing CSS files in your
 [package-overrides]: https://docs.npmjs.com/cli/v10/configuring-npm/package-json#overrides
 [vite-url-imports]: https://vitejs.dev/guide/assets#explicit-url-imports
 [links-export]: ../route/links
+[css-bundling]: #css-bundling
+[css-url-imports]: #css-url-imports

From ad83e53c42b9da24c89408a14d5154563de3b477 Mon Sep 17 00:00:00 2001
From: Jacob Ebey <jacob.ebey@live.com>
Date: Fri, 22 Mar 2024 10:05:48 -0700
Subject: [PATCH 023/108] feat: use undici as fetch polyfill (#9106)

---
 jest/jest.config.shared.js                    |  5 --
 package.json                                  |  1 -
 .../remix-architect/__tests__/server-test.ts  |  8 +--
 packages/remix-architect/server.ts            |  4 +-
 .../remix-express/__tests__/server-test.ts    |  4 +-
 .../__tests__/fileUploadHandler-test.ts       |  5 --
 packages/remix-node/globals.ts                | 52 ++++++-------------
 packages/remix-node/package.json              |  6 +--
 packages/remix-react/__tests__/setup.ts       |  9 +++-
 .../__tests__/formData-test.ts                | 10 +++-
 packages/remix-testing/jest.setup.js          |  9 +++-
 packages/remix-testing/package.json           |  2 +-
 pnpm-lock.yaml                                | 28 +++++-----
 scripts/bump-fetch-versions.sh                |  4 +-
 scripts/deployment-test/_shared.mjs           |  2 +-
 scripts/deployment-test/cf-pages.mjs          |  2 +-
 scripts/deployment-test/cf-workers.mjs        |  2 +-
 17 files changed, 67 insertions(+), 86 deletions(-)

diff --git a/jest/jest.config.shared.js b/jest/jest.config.shared.js
index 547a2da9a6a..0255c1b4c65 100644
--- a/jest/jest.config.shared.js
+++ b/jest/jest.config.shared.js
@@ -9,11 +9,6 @@ const ignorePatterns = [
 /** @type {import('jest').Config} */
 module.exports = {
   moduleNameMapper: {
-    "^@remix-run/web-blob$": require.resolve("@remix-run/web-blob"),
-    "^@remix-run/web-fetch$": require.resolve("@remix-run/web-fetch"),
-    "^@remix-run/web-file": require.resolve("@remix-run/web-file"),
-    "^@remix-run/web-form-data$": require.resolve("@remix-run/web-form-data"),
-    "^@remix-run/web-stream$": require.resolve("@remix-run/web-stream"),
     "^@web3-storage/multipart-parser$": require.resolve(
       "@web3-storage/multipart-parser"
     ),
diff --git a/package.json b/package.json
index 7df0b32c49e..61aede9cd91 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,6 @@
     "@remix-run/css-bundle": "workspace:*",
     "@remix-run/dev": "workspace:*",
     "@remix-run/node": "workspace:*",
-    "@remix-run/web-fetch": "^4.4.2",
     "@remix-run/react": "workspace:*",
     "@remix-run/testing": "workspace:*",
     "@rollup/plugin-babel": "^5.2.2",
diff --git a/packages/remix-architect/__tests__/server-test.ts b/packages/remix-architect/__tests__/server-test.ts
index 7cbfce23f96..196f00f9488 100644
--- a/packages/remix-architect/__tests__/server-test.ts
+++ b/packages/remix-architect/__tests__/server-test.ts
@@ -217,7 +217,7 @@ describe("architect createRemixHeaders", () => {
         "x-foo": "bar, baz",
         "x-bar": "baz",
       });
-      expect(headers.getAll("x-foo")).toEqual(["bar, baz"]);
+      expect(headers.get("x-foo")).toEqual("bar, baz");
       expect(headers.get("x-bar")).toBe("baz");
     });
 
@@ -226,9 +226,9 @@ describe("architect createRemixHeaders", () => {
         "__session=some_value",
         "__other=some_other_value",
       ]);
-      expect(headers.getAll("cookie")).toEqual([
-        "__session=some_value; __other=some_other_value",
-      ]);
+      expect(headers.get("cookie")).toEqual(
+        "__session=some_value; __other=some_other_value"
+      );
     });
   });
 });
diff --git a/packages/remix-architect/server.ts b/packages/remix-architect/server.ts
index 9deda1b3f0a..6ad6c1c692b 100644
--- a/packages/remix-architect/server.ts
+++ b/packages/remix-architect/server.ts
@@ -88,7 +88,9 @@ export function createRemixHeaders(
   }
 
   if (requestCookies) {
-    headers.append("Cookie", requestCookies.join("; "));
+    for (let cookie of requestCookies) {
+      headers.append("Cookie", cookie);
+    }
   }
 
   return headers;
diff --git a/packages/remix-express/__tests__/server-test.ts b/packages/remix-express/__tests__/server-test.ts
index 41d493b0e77..0646d033af4 100644
--- a/packages/remix-express/__tests__/server-test.ts
+++ b/packages/remix-express/__tests__/server-test.ts
@@ -178,7 +178,7 @@ describe("express createRemixHeaders", () => {
         "x-foo": ["bar", "baz"],
         "x-bar": "baz",
       });
-      expect(headers.getAll("x-foo")).toEqual(["bar", "baz"]);
+      expect(headers.get("x-foo")).toEqual("bar, baz");
       expect(headers.get("x-bar")).toBe("baz");
     });
 
@@ -189,7 +189,7 @@ describe("express createRemixHeaders", () => {
           "__other=some_other_value; Path=/; Secure; HttpOnly; Expires=Wed, 21 Oct 2015 07:28:00 GMT; SameSite=Lax",
         ],
       });
-      expect(headers.getAll("set-cookie")).toEqual([
+      expect(headers.getSetCookie()).toEqual([
         "__session=some_value; Path=/; Secure; HttpOnly; MaxAge=7200; SameSite=Lax",
         "__other=some_other_value; Path=/; Secure; HttpOnly; Expires=Wed, 21 Oct 2015 07:28:00 GMT; SameSite=Lax",
       ]);
diff --git a/packages/remix-node/__tests__/fileUploadHandler-test.ts b/packages/remix-node/__tests__/fileUploadHandler-test.ts
index 670db4941b7..0c5a9ea3ff7 100644
--- a/packages/remix-node/__tests__/fileUploadHandler-test.ts
+++ b/packages/remix-node/__tests__/fileUploadHandler-test.ts
@@ -1,14 +1,9 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { ReadableStream } from "@remix-run/web-stream";
 
 import { NodeOnDiskFile } from "../upload/fileUploadHandler";
 import { readableStreamToString } from "../stream";
 
-beforeAll(() => {
-  global.ReadableStream = ReadableStream;
-});
-
 describe("NodeOnDiskFile", () => {
   let filepath = path.resolve(__dirname, "assets/test.txt");
   let size = fs.statSync(filepath).size;
diff --git a/packages/remix-node/globals.ts b/packages/remix-node/globals.ts
index e50a1abf314..2ae3f0daa57 100644
--- a/packages/remix-node/globals.ts
+++ b/packages/remix-node/globals.ts
@@ -5,22 +5,7 @@ import {
   Headers as NodeHeaders,
   Request as NodeRequest,
   Response as NodeResponse,
-} from "@remix-run/web-fetch";
-import {
-  ByteLengthQueuingStrategy as NodeByteLengthQueuingStrategy,
-  CountQueuingStrategy as NodeCountQueuingStrategy,
-  ReadableByteStreamController as NodeReadableByteStreamController,
-  ReadableStream as NodeReadableStream,
-  ReadableStreamBYOBReader as NodeReadableStreamBYOBReader,
-  ReadableStreamBYOBRequest as NodeReadableStreamBYOBRequest,
-  ReadableStreamDefaultController as NodeReadableStreamDefaultController,
-  ReadableStreamDefaultReader as NodeReadableStreamDefaultReader,
-  TransformStream as NodeTransformStream,
-  TransformStreamDefaultController as NodeTransformStreamDefaultController,
-  WritableStream as NodeWritableStream,
-  WritableStreamDefaultController as NodeWritableStreamDefaultController,
-  WritableStreamDefaultWriter as NodeWritableStreamDefaultWriter,
-} from "@remix-run/web-stream";
+} from "undici";
 
 declare global {
   namespace NodeJS {
@@ -41,30 +26,23 @@ declare global {
       WritableStream: typeof WritableStream;
     }
   }
+
+  interface RequestInit {
+    duplex?: "half";
+  }
 }
 
 export function installGlobals() {
-  global.File = NodeFile;
+  global.File = NodeFile as unknown as typeof File;
 
-  global.Headers = NodeHeaders as typeof Headers;
-  global.Request = NodeRequest as typeof Request;
-  global.Response = NodeResponse as unknown as typeof Response;
-  global.fetch = nodeFetch as typeof fetch;
+  // @ts-expect-error - overriding globals
+  global.Headers = NodeHeaders;
+  // @ts-expect-error - overriding globals
+  global.Request = NodeRequest;
+  // @ts-expect-error - overriding globals
+  global.Response = NodeResponse;
+  // @ts-expect-error - overriding globals
+  global.fetch = nodeFetch;
+  // @ts-expect-error - overriding globals
   global.FormData = NodeFormData;
-
-  // Export everything from https://developer.mozilla.org/en-US/docs/Web/API/Streams_API
-  global.ByteLengthQueuingStrategy = NodeByteLengthQueuingStrategy;
-  global.CountQueuingStrategy = NodeCountQueuingStrategy;
-  global.ReadableByteStreamController = NodeReadableByteStreamController;
-  global.ReadableStream = NodeReadableStream;
-  global.ReadableStreamBYOBReader = NodeReadableStreamBYOBReader;
-  global.ReadableStreamBYOBRequest = NodeReadableStreamBYOBRequest;
-  global.ReadableStreamDefaultController = NodeReadableStreamDefaultController;
-  global.ReadableStreamDefaultReader = NodeReadableStreamDefaultReader;
-  global.TransformStream = NodeTransformStream;
-  global.TransformStreamDefaultController =
-    NodeTransformStreamDefaultController;
-  global.WritableStream = NodeWritableStream;
-  global.WritableStreamDefaultController = NodeWritableStreamDefaultController;
-  global.WritableStreamDefaultWriter = NodeWritableStreamDefaultWriter;
 }
diff --git a/packages/remix-node/package.json b/packages/remix-node/package.json
index 759fd44f654..cf517ea7e75 100644
--- a/packages/remix-node/package.json
+++ b/packages/remix-node/package.json
@@ -21,13 +21,11 @@
   },
   "dependencies": {
     "@remix-run/server-runtime": "workspace:*",
-    "@remix-run/web-fetch": "^4.4.2",
-    "@remix-run/web-file": "^3.1.0",
-    "@remix-run/web-stream": "^1.1.0",
     "@web3-storage/multipart-parser": "^1.0.0",
     "cookie-signature": "^1.1.0",
     "source-map-support": "^0.5.21",
-    "stream-slice": "^0.1.2"
+    "stream-slice": "^0.1.2",
+    "undici": "^6.10.1"
   },
   "devDependencies": {
     "@types/cookie-signature": "^1.0.3",
diff --git a/packages/remix-react/__tests__/setup.ts b/packages/remix-react/__tests__/setup.ts
index 451031301ac..87f5cefb48f 100644
--- a/packages/remix-react/__tests__/setup.ts
+++ b/packages/remix-react/__tests__/setup.ts
@@ -1,3 +1,8 @@
-import { installGlobals } from "@remix-run/node";
+const JSDOMFormData = global.FormData;
+global.TextDecoder = require("util").TextDecoder;
+global.TextEncoder = require("util").TextEncoder;
+global.ReadableStream = require("stream/web").ReadableStream;
+global.WritableStream = require("stream/web").WritableStream;
 
-installGlobals();
+require("@remix-run/node").installGlobals();
+global.FormData = JSDOMFormData;
diff --git a/packages/remix-server-runtime/__tests__/formData-test.ts b/packages/remix-server-runtime/__tests__/formData-test.ts
index 430f9e0b3b8..8eeb90f6374 100644
--- a/packages/remix-server-runtime/__tests__/formData-test.ts
+++ b/packages/remix-server-runtime/__tests__/formData-test.ts
@@ -1,5 +1,11 @@
 import { parseMultipartFormData } from "../formData";
 
+declare global {
+  interface RequestInit {
+    duplex?: "half";
+  }
+}
+
 class CustomError extends Error {
   constructor() {
     super("test error");
@@ -21,7 +27,7 @@ describe("parseMultipartFormData", () => {
     let parsedFormData = await parseMultipartFormData(
       req,
       async ({ filename, data, contentType }) => {
-        let chunks = [];
+        let chunks: Uint8Array[] = [];
         for await (let chunk of data) {
           chunks.push(chunk);
         }
@@ -111,6 +117,7 @@ describe("parseMultipartFormData", () => {
         method: "post",
         body,
         headers: underlyingRequest.headers,
+        duplex: "half",
       });
 
       let error: Error;
@@ -151,6 +158,7 @@ describe("parseMultipartFormData", () => {
         method: "post",
         body,
         headers: underlyingRequest.headers,
+        duplex: "half",
       });
 
       let error: Error;
diff --git a/packages/remix-testing/jest.setup.js b/packages/remix-testing/jest.setup.js
index 451031301ac..87f5cefb48f 100644
--- a/packages/remix-testing/jest.setup.js
+++ b/packages/remix-testing/jest.setup.js
@@ -1,3 +1,8 @@
-import { installGlobals } from "@remix-run/node";
+const JSDOMFormData = global.FormData;
+global.TextDecoder = require("util").TextDecoder;
+global.TextEncoder = require("util").TextEncoder;
+global.ReadableStream = require("stream/web").ReadableStream;
+global.WritableStream = require("stream/web").WritableStream;
 
-installGlobals();
+require("@remix-run/node").installGlobals();
+global.FormData = JSDOMFormData;
diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
index 7e3cccae205..9079854fe9d 100644
--- a/packages/remix-testing/package.json
+++ b/packages/remix-testing/package.json
@@ -30,7 +30,7 @@
     "@types/node": "^18.17.1",
     "@types/react": "^18.2.20",
     "@types/react-dom": "^18.2.7",
-    "jest-environment-jsdom": "^29.6.4",
+    "jest-environment-jsdom": "^29.7.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.1.6"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9db271986dd..86f20902365 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -91,9 +91,6 @@ importers:
       '@remix-run/testing':
         specifier: workspace:*
         version: link:packages/remix-testing
-      '@remix-run/web-fetch':
-        specifier: ^4.4.2
-        version: 4.4.2
       '@rollup/plugin-babel':
         specifier: ^5.2.2
         version: 5.3.1(@babel/core@7.23.7)(rollup@2.75.7)
@@ -1185,15 +1182,6 @@ importers:
       '@remix-run/server-runtime':
         specifier: workspace:*
         version: link:../remix-server-runtime
-      '@remix-run/web-fetch':
-        specifier: ^4.4.2
-        version: 4.4.2
-      '@remix-run/web-file':
-        specifier: ^3.1.0
-        version: 3.1.0
-      '@remix-run/web-stream':
-        specifier: ^1.1.0
-        version: 1.1.0
       '@web3-storage/multipart-parser':
         specifier: ^1.0.0
         version: 1.0.0
@@ -1206,6 +1194,9 @@ importers:
       stream-slice:
         specifier: ^0.1.2
         version: 0.1.2
+      undici:
+        specifier: ^6.10.1
+        version: 6.10.1
     devDependencies:
       '@types/cookie-signature':
         specifier: ^1.0.3
@@ -1365,7 +1356,7 @@ importers:
         specifier: ^18.2.7
         version: 18.2.7
       jest-environment-jsdom:
-        specifier: ^29.6.4
+        specifier: ^29.7.0
         version: 29.7.0
       react:
         specifier: ^18.2.0
@@ -4225,7 +4216,7 @@ packages:
       '@web3-storage/multipart-parser': 1.0.0
       abort-controller: 3.0.0
       data-uri-to-buffer: 3.0.1
-      mrmime: 1.0.0
+      mrmime: 1.0.1
     dev: false
 
   /@remix-run/web-file@3.1.0:
@@ -11637,8 +11628,8 @@ packages:
     engines: {node: '>=4'}
     dev: false
 
-  /mrmime@1.0.0:
-    resolution: {integrity: sha512-a70zx7zFfVO7XpnQ2IX1Myh9yY4UYvfld/dikWRnsXxbyvMcfz+u6UfgNAtH+k2QqtJuzVpv6eLTx1G2+WKZbQ==}
+  /mrmime@1.0.1:
+    resolution: {integrity: sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==}
     engines: {node: '>=10'}
     dev: false
 
@@ -14462,6 +14453,11 @@ packages:
     dependencies:
       '@fastify/busboy': 2.1.0
 
+  /undici@6.10.1:
+    resolution: {integrity: sha512-kSzmWrOx3XBKTgPm4Tal8Hyl3yf+hzlA00SAf4goxv8LZYafKmS6gJD/7Fe5HH/DMNiFTRXvkwhLo7mUn5fuQQ==}
+    engines: {node: '>=18.0'}
+    dev: false
+
   /unicode-canonical-property-names-ecmascript@2.0.0:
     resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==}
     engines: {node: '>=4'}
diff --git a/scripts/bump-fetch-versions.sh b/scripts/bump-fetch-versions.sh
index ac2dd3258b9..8813e78fc2e 100755
--- a/scripts/bump-fetch-versions.sh
+++ b/scripts/bump-fetch-versions.sh
@@ -7,7 +7,7 @@ if [ "${VERSION}" == "" ]; then
 fi
 
 
-echo "Updating the web-std-io dependencies to version '${VERSION}'"
+echo "Updating the undici dependencies to version '${VERSION}'"
 echo ""
 
 if [ ! -d "packages/remix-node" ]; then
@@ -18,7 +18,7 @@ fi
 set -x
 
 cd packages/remix-node
-pnpm add @remix-run/web-fetch@${VERSION} @remix-run/web-file@${VERSION} @remix-run/web-stream@${VERSION}
+pnpm add undici@${VERSION}
 cd ../..
 
 set +x
\ No newline at end of file
diff --git a/scripts/deployment-test/_shared.mjs b/scripts/deployment-test/_shared.mjs
index eb6055f1740..467b4d3bbcb 100644
--- a/scripts/deployment-test/_shared.mjs
+++ b/scripts/deployment-test/_shared.mjs
@@ -5,8 +5,8 @@ import crypto from "node:crypto";
 import { sync as spawnSync } from "cross-spawn";
 import PackageJson from "@npmcli/package-json";
 import jsonfile from "jsonfile";
-import { fetch } from "@remix-run/web-fetch";
 import retry from "fetch-retry";
+import { fetch } from "undici";
 
 let fetchRetry = retry(fetch);
 
diff --git a/scripts/deployment-test/cf-pages.mjs b/scripts/deployment-test/cf-pages.mjs
index 97661b1c836..ebd500be436 100644
--- a/scripts/deployment-test/cf-pages.mjs
+++ b/scripts/deployment-test/cf-pages.mjs
@@ -1,8 +1,8 @@
 import path from "node:path";
 import { sync as spawnSync } from "cross-spawn";
 import fse from "fs-extra";
-import { fetch } from "@remix-run/web-fetch";
 import PackageJson from "@npmcli/package-json";
+import { fetch } from "undici";
 
 import {
   addCypress,
diff --git a/scripts/deployment-test/cf-workers.mjs b/scripts/deployment-test/cf-workers.mjs
index 9e6e73d1603..5c69a9e21f6 100644
--- a/scripts/deployment-test/cf-workers.mjs
+++ b/scripts/deployment-test/cf-workers.mjs
@@ -2,8 +2,8 @@ import path from "node:path";
 import { sync as spawnSync } from "cross-spawn";
 import fse from "fs-extra";
 import toml from "@iarna/toml";
-import { fetch } from "@remix-run/web-fetch";
 import PackageJson from "@npmcli/package-json";
+import { fetch } from "undici";
 
 import {
   addCypress,

From e9b11e424905666e08d14e26cd020439a4b9d312 Mon Sep 17 00:00:00 2001
From: Jacob Ebey <jacob.ebey@live.com>
Date: Fri, 22 Mar 2024 11:16:04 -0700
Subject: [PATCH 024/108] forgot to add a changeset (#9111)

---
 .changeset/brave-cars-approve.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/brave-cars-approve.md

diff --git a/.changeset/brave-cars-approve.md b/.changeset/brave-cars-approve.md
new file mode 100644
index 00000000000..a8c3700ef6d
--- /dev/null
+++ b/.changeset/brave-cars-approve.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/node": minor
+---
+
+Use undici as our fetch polyfill going forward. #9106

From 48ec0686cd19b9eede081b6aa1388853f7754925 Mon Sep 17 00:00:00 2001
From: Mark Dalgleish <mark.john.dalgleish@gmail.com>
Date: Mon, 25 Mar 2024 10:49:00 +1100
Subject: [PATCH 025/108] Remove old Vite template (#9126)

---
 templates/vite/.eslintrc.cjs         |  83 ----------------
 templates/vite/.gitignore            |   5 -
 templates/vite/README.md             |  36 -------
 templates/vite/app/entry.client.tsx  |  18 ----
 templates/vite/app/entry.server.tsx  | 140 ---------------------------
 templates/vite/app/root.tsx          |  29 ------
 templates/vite/app/routes/_index.tsx |  41 --------
 templates/vite/package.json          |  39 --------
 templates/vite/public/favicon.ico    | Bin 16958 -> 0 bytes
 templates/vite/tsconfig.json         |  32 ------
 templates/vite/vite.config.ts        |  10 --
 11 files changed, 433 deletions(-)
 delete mode 100644 templates/vite/.eslintrc.cjs
 delete mode 100644 templates/vite/.gitignore
 delete mode 100644 templates/vite/README.md
 delete mode 100644 templates/vite/app/entry.client.tsx
 delete mode 100644 templates/vite/app/entry.server.tsx
 delete mode 100644 templates/vite/app/root.tsx
 delete mode 100644 templates/vite/app/routes/_index.tsx
 delete mode 100644 templates/vite/package.json
 delete mode 100644 templates/vite/public/favicon.ico
 delete mode 100644 templates/vite/tsconfig.json
 delete mode 100644 templates/vite/vite.config.ts

diff --git a/templates/vite/.eslintrc.cjs b/templates/vite/.eslintrc.cjs
deleted file mode 100644
index c3128a897c8..00000000000
--- a/templates/vite/.eslintrc.cjs
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * This is intended to be a basic starting point for linting in your app.
- * It relies on recommended configs out of the box for simplicity, but you can
- * and should modify this configuration to best suit your team's needs.
- */
-
-/** @type {import('eslint').Linter.Config} */
-module.exports = {
-  root: true,
-  parserOptions: {
-    ecmaVersion: "latest",
-    sourceType: "module",
-    ecmaFeatures: {
-      jsx: true,
-    },
-  },
-  env: {
-    browser: true,
-    commonjs: true,
-    es6: true,
-  },
-
-  // Base config
-  extends: ["eslint:recommended"],
-
-  overrides: [
-    // React
-    {
-      files: ["**/*.{js,jsx,ts,tsx}"],
-      plugins: ["react", "jsx-a11y"],
-      extends: [
-        "plugin:react/recommended",
-        "plugin:react/jsx-runtime",
-        "plugin:react-hooks/recommended",
-        "plugin:jsx-a11y/recommended",
-      ],
-      settings: {
-        react: {
-          version: "detect",
-        },
-        formComponents: ["Form"],
-        linkComponents: [
-          { name: "Link", linkAttribute: "to" },
-          { name: "NavLink", linkAttribute: "to" },
-        ],
-        "import/resolver": {
-          typescript: {},
-        },
-      },
-    },
-
-    // Typescript
-    {
-      files: ["**/*.{ts,tsx}"],
-      plugins: ["@typescript-eslint", "import"],
-      parser: "@typescript-eslint/parser",
-      settings: {
-        "import/internal-regex": "^~/",
-        "import/resolver": {
-          node: {
-            extensions: [".ts", ".tsx"],
-          },
-          typescript: {
-            alwaysTryTypes: true,
-          },
-        },
-      },
-      extends: [
-        "plugin:@typescript-eslint/recommended",
-        "plugin:import/recommended",
-        "plugin:import/typescript",
-      ],
-    },
-
-    // Node
-    {
-      files: [".eslintrc.cjs"],
-      env: {
-        node: true,
-      },
-    },
-  ],
-};
diff --git a/templates/vite/.gitignore b/templates/vite/.gitignore
deleted file mode 100644
index 80ec311f4ff..00000000000
--- a/templates/vite/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-node_modules
-
-/.cache
-/build
-.env
diff --git a/templates/vite/README.md b/templates/vite/README.md
deleted file mode 100644
index c05e097d923..00000000000
--- a/templates/vite/README.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# Welcome to Remix + Vite!
-
-📖 See the [Remix docs](https://remix.run/docs) and the [Remix Vite docs](https://remix.run/docs/en/main/future/vite) for details on supported features.
-
-## Development
-
-Run the Vite dev server:
-
-```shellscript
-npm run dev
-```
-
-## Deployment
-
-First, build your app for production:
-
-```sh
-npm run build
-```
-
-Then run the app in production mode:
-
-```sh
-npm start
-```
-
-Now you'll need to pick a host to deploy it to.
-
-### DIY
-
-If you're familiar with deploying Node applications, the built-in Remix app server is production-ready.
-
-Make sure to deploy the output of `npm run build`
-
-- `build/server`
-- `build/client`
diff --git a/templates/vite/app/entry.client.tsx b/templates/vite/app/entry.client.tsx
deleted file mode 100644
index 94d5dc0de0f..00000000000
--- a/templates/vite/app/entry.client.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * By default, Remix will handle hydrating your app on the client for you.
- * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨
- * For more information, see https://remix.run/file-conventions/entry.client
- */
-
-import { RemixBrowser } from "@remix-run/react";
-import { startTransition, StrictMode } from "react";
-import { hydrateRoot } from "react-dom/client";
-
-startTransition(() => {
-  hydrateRoot(
-    document,
-    <StrictMode>
-      <RemixBrowser />
-    </StrictMode>
-  );
-});
diff --git a/templates/vite/app/entry.server.tsx b/templates/vite/app/entry.server.tsx
deleted file mode 100644
index 45db3229c68..00000000000
--- a/templates/vite/app/entry.server.tsx
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * By default, Remix will handle generating the HTTP Response for you.
- * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨
- * For more information, see https://remix.run/file-conventions/entry.server
- */
-
-import { PassThrough } from "node:stream";
-
-import type { AppLoadContext, EntryContext } from "@remix-run/node";
-import { createReadableStreamFromReadable } from "@remix-run/node";
-import { RemixServer } from "@remix-run/react";
-import { isbot } from "isbot";
-import { renderToPipeableStream } from "react-dom/server";
-
-const ABORT_DELAY = 5_000;
-
-export default function handleRequest(
-  request: Request,
-  responseStatusCode: number,
-  responseHeaders: Headers,
-  remixContext: EntryContext,
-  // This is ignored so we can keep it in the template for visibility.  Feel
-  // free to delete this parameter in your app if you're not using it!
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  loadContext: AppLoadContext
-) {
-  return isbot(request.headers.get("user-agent") || "")
-    ? handleBotRequest(
-        request,
-        responseStatusCode,
-        responseHeaders,
-        remixContext
-      )
-    : handleBrowserRequest(
-        request,
-        responseStatusCode,
-        responseHeaders,
-        remixContext
-      );
-}
-
-function handleBotRequest(
-  request: Request,
-  responseStatusCode: number,
-  responseHeaders: Headers,
-  remixContext: EntryContext
-) {
-  return new Promise((resolve, reject) => {
-    let shellRendered = false;
-    const { pipe, abort } = renderToPipeableStream(
-      <RemixServer
-        context={remixContext}
-        url={request.url}
-        abortDelay={ABORT_DELAY}
-      />,
-      {
-        onAllReady() {
-          shellRendered = true;
-          const body = new PassThrough();
-          const stream = createReadableStreamFromReadable(body);
-
-          responseHeaders.set("Content-Type", "text/html");
-
-          resolve(
-            new Response(stream, {
-              headers: responseHeaders,
-              status: responseStatusCode,
-            })
-          );
-
-          pipe(body);
-        },
-        onShellError(error: unknown) {
-          reject(error);
-        },
-        onError(error: unknown) {
-          responseStatusCode = 500;
-          // Log streaming rendering errors from inside the shell.  Don't log
-          // errors encountered during initial shell rendering since they'll
-          // reject and get logged in handleDocumentRequest.
-          if (shellRendered) {
-            console.error(error);
-          }
-        },
-      }
-    );
-
-    setTimeout(abort, ABORT_DELAY);
-  });
-}
-
-function handleBrowserRequest(
-  request: Request,
-  responseStatusCode: number,
-  responseHeaders: Headers,
-  remixContext: EntryContext
-) {
-  return new Promise((resolve, reject) => {
-    let shellRendered = false;
-    const { pipe, abort } = renderToPipeableStream(
-      <RemixServer
-        context={remixContext}
-        url={request.url}
-        abortDelay={ABORT_DELAY}
-      />,
-      {
-        onShellReady() {
-          shellRendered = true;
-          const body = new PassThrough();
-          const stream = createReadableStreamFromReadable(body);
-
-          responseHeaders.set("Content-Type", "text/html");
-
-          resolve(
-            new Response(stream, {
-              headers: responseHeaders,
-              status: responseStatusCode,
-            })
-          );
-
-          pipe(body);
-        },
-        onShellError(error: unknown) {
-          reject(error);
-        },
-        onError(error: unknown) {
-          responseStatusCode = 500;
-          // Log streaming rendering errors from inside the shell.  Don't log
-          // errors encountered during initial shell rendering since they'll
-          // reject and get logged in handleDocumentRequest.
-          if (shellRendered) {
-            console.error(error);
-          }
-        },
-      }
-    );
-
-    setTimeout(abort, ABORT_DELAY);
-  });
-}
diff --git a/templates/vite/app/root.tsx b/templates/vite/app/root.tsx
deleted file mode 100644
index e82f26fd179..00000000000
--- a/templates/vite/app/root.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import {
-  Links,
-  Meta,
-  Outlet,
-  Scripts,
-  ScrollRestoration,
-} from "@remix-run/react";
-
-export function Layout({ children }: { children: React.ReactNode }) {
-  return (
-    <html lang="en">
-      <head>
-        <meta charSet="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <Meta />
-        <Links />
-      </head>
-      <body>
-        {children}
-        <ScrollRestoration />
-        <Scripts />
-      </body>
-    </html>
-  );
-}
-
-export default function App() {
-  return <Outlet />;
-}
diff --git a/templates/vite/app/routes/_index.tsx b/templates/vite/app/routes/_index.tsx
deleted file mode 100644
index 5347369230e..00000000000
--- a/templates/vite/app/routes/_index.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import type { MetaFunction } from "@remix-run/node";
-
-export const meta: MetaFunction = () => {
-  return [
-    { title: "New Remix App" },
-    { name: "description", content: "Welcome to Remix!" },
-  ];
-};
-
-export default function Index() {
-  return (
-    <div style={{ fontFamily: "system-ui, sans-serif", lineHeight: "1.8" }}>
-      <h1>Welcome to Remix</h1>
-      <ul>
-        <li>
-          <a
-            target="_blank"
-            href="https://remix.run/tutorials/blog"
-            rel="noreferrer"
-          >
-            15m Quickstart Blog Tutorial
-          </a>
-        </li>
-        <li>
-          <a
-            target="_blank"
-            href="https://remix.run/tutorials/jokes"
-            rel="noreferrer"
-          >
-            Deep Dive Jokes App Tutorial
-          </a>
-        </li>
-        <li>
-          <a target="_blank" href="https://remix.run/docs" rel="noreferrer">
-            Remix Docs
-          </a>
-        </li>
-      </ul>
-    </div>
-  );
-}
diff --git a/templates/vite/package.json b/templates/vite/package.json
deleted file mode 100644
index ba824c84d9c..00000000000
--- a/templates/vite/package.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "private": true,
-  "sideEffects": false,
-  "type": "module",
-  "scripts": {
-    "build": "remix vite:build",
-    "dev": "remix vite:dev",
-    "lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
-    "start": "remix-serve ./build/server/index.js",
-    "typecheck": "tsc"
-  },
-  "dependencies": {
-    "@remix-run/node": "*",
-    "@remix-run/react": "*",
-    "@remix-run/serve": "*",
-    "isbot": "^4.1.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0"
-  },
-  "devDependencies": {
-    "@remix-run/dev": "*",
-    "@types/react": "^18.2.20",
-    "@types/react-dom": "^18.2.7",
-    "@typescript-eslint/eslint-plugin": "^6.7.4",
-    "@typescript-eslint/parser": "^6.7.4",
-    "eslint": "^8.38.0",
-    "eslint-import-resolver-typescript": "^3.6.1",
-    "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-jsx-a11y": "^6.7.1",
-    "eslint-plugin-react": "^7.33.2",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "typescript": "^5.1.6",
-    "vite": "^5.1.0",
-    "vite-tsconfig-paths": "^4.2.1"
-  },
-  "engines": {
-    "node": ">=18.0.0"
-  }
-}
diff --git a/templates/vite/public/favicon.ico b/templates/vite/public/favicon.ico
deleted file mode 100644
index 8830cf6821b354114848e6354889b8ecf6d2bc61..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16958
zcmeI3+jCXb9mnJN2h^uNlXH@jlam{_a8F3W{T}Wih>9YJpaf7TUbu)A5fv|h7OMfR
zR;q$lr&D!wv|c)`wcw1?>4QT1(&|jdsrI2h`Rn)dTW5t$8pz=s3_5L?#oBxAowe8R
z_WfPfN?F+@`q$D@rvC?(W!uWieppskmQ~YG*>*L?{img@tWpnYXZslxeh#TSUS3{q
z1Ju6JcfQSbQuORq69@YK(X-3c9vC2c2a2z~zw=F=50@pm0PUiCAm!bAT?2jpM`(^b
zC|2&Ngngt^<>oCv#<S!-dX;>?P(AZ`5_84x#QBPulix)TpkIAUp=(KgGo4CVS~Sxt
zVoR4>r5g9%bDh7hi0|v$={zr>CHd`?-l4^Ld(Z9PNz9piFY+llUw_x4ou7Vf-q%$g
z)&)J4>6Ft~RZ(uV>dJD<Ri@O+ttLaCvYPyTPWL>|`nxI1^x{X<kw8nThj+Y}tw{Or
zRjUv4hrU{KGhbGHm9Ho8JkC+BwU&#I{n0PFy7kVfbG?_+T+m-3nxQ?DUla7zinfMq
z%7#>@Z5S<=vf;V3w_(*O-7}W<=e$=}CB9_R;)m9)d7`d_xx+nl^Bg|%ew=?uoKO8w
zeQU7h;~8s!@9-k>7Cx}<bJ3N5)-UEEpLCvfc#RzR<`8{*xab{Oo3=4^71mT=VdDqW
z($=D$#(h&m+Q#bHD81KM6L?WCy3h+`$eLs0K9?!C`fS>1<o!{ao8ND$Pg}FkS7GCH
zJw}ah!*h61t2v#otd%vZ6+nN#?=TPYL0-^ar*$LiQFUQGZ9^+;N@Jx>SDQ7m(&miH
zs8!l*wOJ!GHbdh)pD--&W3+w`9YJ=;m^FtMY=`mTq8pyV!-@L6smwp3(q?G>=_4v^
zn(ikLue7!y70#2uhqUVpb7fp!=xu2{aM^1P^pts#+feZv8d~)2sf`sjXLQCEj;pdI
z%~f`JOO;*KnziMv^i_6+?mL?^wrE_&=IT9o1i!}Sd4Sx4O@w~1bi1)8<?^1W_hyQJ
z^TuRsvF7h=(){B?>(sXvYR-1?7~Zr<=SJ1Cw!i~yfi=4h6o3O~(-Sb2Ilwq%g$+V`
z>(C&N1!FV5rWF&iwt8~b)=jIn4b!XbrWrZgIHTISrdHcpjjx=TwJXI7_%Ks4oFLl9
zNT;!%!P4~xH85njXdfqgnIxIFOOKW`W$fxU%{{5wZkVF^G=JB$oUNU5dQSL&ZnR1s
z*ckJ$R`eCUJsWL>j6*+|2S1TL_J|Fl&kt=~XZF=+=iT0Xq1*KU-NuH%NAQff$LJp3
zU_*a;@7I0K{mqwux87~vwsp<}@P>KNDb}3U+6$rcZ114|QTMUSk+rhPA(b{$>pQTc
zIQri{+U>GMzsCy0Mo4BfWXJlkk;RhfpWpAB{=Rtr*d1MNC+H3Oi5+3D$gUI&AjV-1
z=0Z<L3zM*4u<g-e=|9$O^MnPHwN`w?DDl)WJ}-Op{;HO&ee}ljeagQt`n!MJWs7Ai
z;3B>Oox+bGyHe=yk-yu%=+{~&46C$ut^ZN+ysx$NH}*F43)3bKkMsxGyIl#>7Yb8W
zO{}&LUO8Ow{7>!bvSq?X{15&Y|4}0w2=o_^0ZzYgB+4HhZ4>s*mW&?RQ6&AY|CPcx
z$*LjftNS|H)ePYnIKNg{ck*|y7EJ&Co0ho0K`!{ENPkASeKy-JWE}dF_%}j)Z5a&q
zXAI2gPu6`s-@baW=*+keiE$A<b_MR?C-5PseqT8KkKDY(u92UZE4^yfJYZmLRl0Qj
z2mi$bu(VF|VOOk`m}JGAX2-zC@9eU}cdfT)cCWW1_iV7|_H3}{?+yJCT{HgFuJ!hW
z-dneDylkh+V;A%t9|&GGNe?DVALeWQ(D9>LIs5G6_X_6kgKK8n3jH2-H9`6bo)Qn1
zZ2x)xPt1=`9V|bE4*;j9$X20+xQCc$rEK<k`Fi~Hjq>|9OwH-O+Q*k`ZNw}K##SkY
z3u}aCV%V|j@!gL5(*5fuWo>JFjeU9Qqk`$bdwH8(qZovE2tA7WUpoCE=VKm^eZ|vZ
z(k<+j*mGJVah>8CkAsMD6#I$RtF;#57Wi`c_^k5?+KCmX$;Ky2*6<J=fcB~4B|ZV&
z?~?BCTu@_QfA&ei^lx3%=--_q{3EVljTZ#}J^n$D1~~>|Q^bJ8+s%2MB}OH-g$Ev^
zO3uqfGjuN%CZiu<`aCuKCh{kK!dDZ+<Fl~arF!o=>CcwgIeU2dsDfz+V>V3BDb~)~
zO!2l!_)m;ZepR~sL+-~s<YrF4FaR4!(myY+152d8&=KNvctHGLWgQw{tVX<yoWW_Z
zj-Hr!ndH7odVllGob8-nW3NBFv0(bY`1FL^9N&SL;FHHcq95!k&HtnS;-hG%hCy5j
z26`MMf5rEpW07<ly2*EzOXtyjasql9V^`87BWQ&$%XE#tlN;dgHVN~f{lTSm_O}mT
zE0})bgjJdY-h#`-)Z`P?PD;&z;T?03pC|DTyTxXaAF{>HS7;5ZB|~uUM&&5vDda2b
z)CW8S6GI*oF><|ZeY5D^+Mcsri)!tmrM33qvwI4r9o@(GlW!u2R>>sB|E#%W`c*@5
z|0iA|`{6aA7D4Q?vc1{vT-#yytn07`H!QIO^1+X7?zG3%y0<K~L$`F=p)E9B=Nsdp
zb=qM)|Jkjbc68S&dsX^=;-v%j)u|KbMf(>gPdIPUJ#s*DNAwd}m1_IMN1^T&be~+E
z_z%1W^9~dl|Me9U6+3oNyuMDkF*z_;dOG(Baa*yq;TRiw{EO~O_S6>e*L(+Cdu(TM
z@o%xTCV%hi&p)x3_inIF!b|W4|AF5p?y1j)cr9RG@v%QVaN8&LaorC-kJz_ExfVHB
za!mtuee#Vb?dh&bwrfGHYAiX&&|v$}U*UBM;#F!N=x>x|G5s0zOa9{(`=k4v^6iK3
z8d&=O@xhDs{;v7<i<J%blPl`%F2zV2g`fBkaG1Pogz882RUuz5)%QjDQ|qVROU;s)
z&2zMiK!4P)&yT-qFYjDtyBF5F{*y1vPxwCS6y&Rpe_)teF|v>JQ%eO;!Bt`&*MH&d
zp^K#dkq;jnJz%%bsqwlaKA5<gd^+Mkxi7IxDK-%BFT|4IAN4BoH1O}I%ID%*E>?fy
zS5JDbO#BgSAdi8<E3bcf{8u~%MEaSFm@4?cP}e`Oy}11ULi6hN?%l2f)C{Mn9*>NM
zDo2SifX6^Z;vn>cBh-?~r_n9qYvP|3ihrnqq6deS-#>l#dV4mX|G%L8|EL;$U+w69
z;rTK3FW$ewUfH|R-Z;3;jvpfiDm?Fvyu9PeR>wi|E8>&j2Z@2h`U}|$><c4e{h$1w
z{FfRq@#VNY57^%!w<Fg>2d`BPV3pz#ViIzH8v6pP^L-p!GbLv<;(p>}_6u&E6XO5-
zJ8JEvJ1)0>{iSd|kOQn#?0rTYL=KSmgMHCf$Qbm;7|8d(goD&T-~oCDuZf57iP#_Y
zmxaoOSjQsm*^u+m$L9AMqwi=6bpdiAY6k3akjGN{xOZ`_J<~Puyzpi7yhhKrLmXV;
z@ftONPy;Uw1F#{_fyGbk04yLE01v=i_5`RqQP+SUH0nb=O?l!J)qCSTdsbmjFJrTm
zx4^ef@qt{B+TV_OHOhtR?XT}1Etm(f21;#qyyW6FpnM+S7*M1iME?9fe8d-`Q#InN
z?^y{C_|8bxgUE@!o+Z72C)BrS&5D`gb-X8kq*1G7Uld-z19V}HY~mK#!o9MC-*#^+
znEsdc-|jj0+%cgBMy(cEkq4IQ1D*b;17Lyp>Utnsz%LRTfjQKL*vo(yJxwtw^)l|!
z7jhIDdtLB}m<l{aZcDUR3Vu-k+`XvA-r9dt!Sv$?zyM+)c*=UnSwkF9d<+EdBK`0Z
zOvSg<Db557lC(Q*`Yt{Kj07Xt>pkOIG&4@F+9cYkS5r%%jz}I0R#F4oBMf-|Jmmk*
zk^OEzF%}%5{a~kGYbFjV1n>HKC+a`;&-n*v_kD2DPP~n5(QE3C;30L<32GB*qV2z$
zWR1Kh=^1-q)P37WS6YWKlUSDe=eD^u_CV+P)q!3^{=$#b^auG<yDY{2eGgE&A8BtO
z4iN3=GdAq!6NGK#1^8e5z+BOTJyYw8ZN6Vq<F5*1vQvB~xg>S7m8zFfFS<>(e~)TG
z&uwWhSoetoe!1^<uYo6XVYh$jYq2>%)O}=6{SUcw-UQmw+i8lokRASPsbT=H|4D|(
zk^P7>TUEFho!3qXSWn$<jp767-aNC~whQ<7bkx~XU6anc7IYxL2j=)Mxg_x)9qvoF
z`x}FAA^ubCS9(wUhmE&MfARUmoSgHZc6;O0te<(<Bs#F)Ewf{<YvCDVx6mZtTa~xm
zriQQIAzi=kic!|RagNu)PQFvP&x`TjzqMDed4BN!oRJwP`eO||`2Qm5kC>m2{lHXw
zD>eN6-;wwq9(?@f^F4L2Ny5_6!d~iiA^s~(|B*lbZir-$&%)l>%Q(36yOIAu|326K
ztmBWz|MLA{Kj(H_{w2gd*nZ6a@ma(w==~EHIscEk|C=NGJa%Ruh4_+~f|%rt{I5v*
zIX@F?|KJID56-ivb+PLo(9hn_CdK{irOcL15>JNQFY112^$+}JPyI{uQ~$&E*=ri;
z`d^fH?4f=8vKHT4!p9O*fX(brB75Y9?e>T9=X#Fc@V#%@5^)~#zu5I(=>LQA-EGTS
zecy*#6gG+8lapch#Hh%vl(+}J;Q!hC1OKoo;#h3#V%5Js)tQ)|>pTT@1ojd+F9Gey
zg`B)zm`|Mo%tH31<UKv~=W{;tJ>s4=<+`Pu|B3orXwNyIcNN>;fBkIj^X8P}RXhF=
zXQK1u5RLN7k#_Q(KznJrALtMM13!vhfr025ar?@-%{l|uWt@NEd<$~n><jfS>RQL{
z+o;->n)+~0tt(u|o_9h!T`%M8%)w2awpV9b*xz9Pl-daUJm3y-HT%xg`^mFd6LBeL
z!0~s;zEr)Bn9x)I(wx`;JVwvRcc^io2XX(Nn3vr3dgbrr@YJ?K3w18P*52^ieBCQP
z=Up1V$N2~5ppJHRTeY8QfM(7Yv&RG7oWJAy<l59ZkqbHxP9b+_2e(SqeV4yuK)@1s
z%lQX#-VwqX^njWV_Q$z9&VW$+qSn=+HB*x>v?c3g(29)P)u;_o&w|&)HGDIinXT~p
z3;S|e$=&Tek9Wn!`cdY+d-w@o`37}x{(hl>ykB|%9yB$CGdIcl7Z?d&lJ%}QHck77
zJPR%C+s2w1_Dl_pxu6$Zi!`HmoD-%7OD@7%lKLL^Ixd9VlRSW*o&$^iQ2z+}hTgH)
z#91TO#+jH<`w4L}XWOt(`gqM*uTUcky`O(mEyU|4dJoy6*UZJ7%*}ajuos%~>&P2j
zk23f5<@GeV?(?`l=ih+D8t`d72xrUjv0wsg;%s1@*2p?TQ;n2$pV7h?_T%sL>iL@w
zZ{lmc<|B7!e&o!zs6RW+u8+aDyUdG>ZS(v&rT$QVymB7sEC@VsK1dg^3F@K90-wYB
zX!we79q<?(Wh~izEdPF0&->x`(6LA>F$~{{xE8-3Wzyfe`+Lsce(?uj{k@lb9<ViF
zY+O(5$+i4C_V5c{<+16E=ROu{Q$6GPT4S6q&{_K5u_V`@ycX##{0*QmV{dZ2nCqY;
zA?8S4GZ*)9&c3dbWAVLjyN70I=SO__U;F#l<Io(a5C3z2A@tzemRqUwLt}5+d-0(~
z@9;OFU}KNoe$TIui>7YTJt#>l*Z&LyKX@zjmu?UJC9w~;|NsB{%7G}y*uNDBxirfC
EKbET!0{{R3

diff --git a/templates/vite/tsconfig.json b/templates/vite/tsconfig.json
deleted file mode 100644
index 9d87dd378f5..00000000000
--- a/templates/vite/tsconfig.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "include": [
-    "**/*.ts",
-    "**/*.tsx",
-    "**/.server/**/*.ts",
-    "**/.server/**/*.tsx",
-    "**/.client/**/*.ts",
-    "**/.client/**/*.tsx"
-  ],
-  "compilerOptions": {
-    "lib": ["DOM", "DOM.Iterable", "ES2022"],
-    "types": ["@remix-run/node", "vite/client"],
-    "isolatedModules": true,
-    "esModuleInterop": true,
-    "jsx": "react-jsx",
-    "module": "ESNext",
-    "moduleResolution": "Bundler",
-    "resolveJsonModule": true,
-    "target": "ES2022",
-    "strict": true,
-    "allowJs": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "baseUrl": ".",
-    "paths": {
-      "~/*": ["./app/*"]
-    },
-
-    // Vite takes care of building everything, not tsc.
-    "noEmit": true
-  }
-}
diff --git a/templates/vite/vite.config.ts b/templates/vite/vite.config.ts
deleted file mode 100644
index 2b6aff98727..00000000000
--- a/templates/vite/vite.config.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { vitePlugin as remix } from "@remix-run/dev";
-import { installGlobals } from "@remix-run/node";
-import { defineConfig } from "vite";
-import tsconfigPaths from "vite-tsconfig-paths";
-
-installGlobals();
-
-export default defineConfig({
-  plugins: [remix(), tsconfigPaths()],
-});

From fbb1a90dab8e0ba14b51a69e4e27501184c4466b Mon Sep 17 00:00:00 2001
From: Aaron <lifeiscontent@users.noreply.github.com>
Date: Mon, 25 Mar 2024 08:32:25 -0700
Subject: [PATCH 026/108] chore: fix eslint ignore patterns for vite (#9095)

Co-authored-by: Matt Brophy <matt@brophy.org>
---
 templates/vite-cloudflare/.eslintrc.cjs | 1 +
 templates/vite-express/.eslintrc.cjs    | 1 +
 templates/vite/.eslintrc.cjs            | 1 +
 3 files changed, 3 insertions(+)

diff --git a/templates/vite-cloudflare/.eslintrc.cjs b/templates/vite-cloudflare/.eslintrc.cjs
index c3128a897c8..4f6f59eee1e 100644
--- a/templates/vite-cloudflare/.eslintrc.cjs
+++ b/templates/vite-cloudflare/.eslintrc.cjs
@@ -19,6 +19,7 @@ module.exports = {
     commonjs: true,
     es6: true,
   },
+  ignorePatterns: ["!**/.server", "!**/.client"],
 
   // Base config
   extends: ["eslint:recommended"],
diff --git a/templates/vite-express/.eslintrc.cjs b/templates/vite-express/.eslintrc.cjs
index 6bd1baae98f..bb26c82d0a2 100644
--- a/templates/vite-express/.eslintrc.cjs
+++ b/templates/vite-express/.eslintrc.cjs
@@ -19,6 +19,7 @@ module.exports = {
     commonjs: true,
     es6: true,
   },
+  ignorePatterns: ["!**/.server", "!**/.client"],
 
   // Base config
   extends: ["eslint:recommended"],
diff --git a/templates/vite/.eslintrc.cjs b/templates/vite/.eslintrc.cjs
index c3128a897c8..4f6f59eee1e 100644
--- a/templates/vite/.eslintrc.cjs
+++ b/templates/vite/.eslintrc.cjs
@@ -19,6 +19,7 @@ module.exports = {
     commonjs: true,
     es6: true,
   },
+  ignorePatterns: ["!**/.server", "!**/.client"],
 
   // Base config
   extends: ["eslint:recommended"],

From 0d0e98a23fc70290ddb6b4eec36f5e8c27a561df Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Mon, 25 Mar 2024 11:43:22 -0400
Subject: [PATCH 027/108] chore: fix eslint ignore patterns for vite

Cherry pick of fbb1a90d (#9095)
---
 templates/cloudflare/.eslintrc.cjs       | 1 +
 templates/express/.eslintrc.cjs          | 1 +
 templates/remix-javascript/.eslintrc.cjs | 1 +
 templates/remix-tutorial/.eslintrc.cjs   | 1 +
 templates/remix/.eslintrc.cjs            | 1 +
 templates/spa/.eslintrc.cjs              | 1 +
 6 files changed, 6 insertions(+)

diff --git a/templates/cloudflare/.eslintrc.cjs b/templates/cloudflare/.eslintrc.cjs
index c3128a897c8..4f6f59eee1e 100644
--- a/templates/cloudflare/.eslintrc.cjs
+++ b/templates/cloudflare/.eslintrc.cjs
@@ -19,6 +19,7 @@ module.exports = {
     commonjs: true,
     es6: true,
   },
+  ignorePatterns: ["!**/.server", "!**/.client"],
 
   // Base config
   extends: ["eslint:recommended"],
diff --git a/templates/express/.eslintrc.cjs b/templates/express/.eslintrc.cjs
index 6bd1baae98f..bb26c82d0a2 100644
--- a/templates/express/.eslintrc.cjs
+++ b/templates/express/.eslintrc.cjs
@@ -19,6 +19,7 @@ module.exports = {
     commonjs: true,
     es6: true,
   },
+  ignorePatterns: ["!**/.server", "!**/.client"],
 
   // Base config
   extends: ["eslint:recommended"],
diff --git a/templates/remix-javascript/.eslintrc.cjs b/templates/remix-javascript/.eslintrc.cjs
index 07ce6811453..7dc1680d507 100644
--- a/templates/remix-javascript/.eslintrc.cjs
+++ b/templates/remix-javascript/.eslintrc.cjs
@@ -19,6 +19,7 @@ module.exports = {
     commonjs: true,
     es6: true,
   },
+  ignorePatterns: ["!**/.server", "!**/.client"],
 
   // Base config
   extends: ["eslint:recommended"],
diff --git a/templates/remix-tutorial/.eslintrc.cjs b/templates/remix-tutorial/.eslintrc.cjs
index 8f2bbcd8af9..52350269b62 100644
--- a/templates/remix-tutorial/.eslintrc.cjs
+++ b/templates/remix-tutorial/.eslintrc.cjs
@@ -19,6 +19,7 @@ module.exports = {
     commonjs: true,
     es6: true,
   },
+  ignorePatterns: ["!**/.server", "!**/.client"],
 
   // Base config
   extends: ["eslint:recommended"],
diff --git a/templates/remix/.eslintrc.cjs b/templates/remix/.eslintrc.cjs
index c3128a897c8..4f6f59eee1e 100644
--- a/templates/remix/.eslintrc.cjs
+++ b/templates/remix/.eslintrc.cjs
@@ -19,6 +19,7 @@ module.exports = {
     commonjs: true,
     es6: true,
   },
+  ignorePatterns: ["!**/.server", "!**/.client"],
 
   // Base config
   extends: ["eslint:recommended"],
diff --git a/templates/spa/.eslintrc.cjs b/templates/spa/.eslintrc.cjs
index c3128a897c8..4f6f59eee1e 100644
--- a/templates/spa/.eslintrc.cjs
+++ b/templates/spa/.eslintrc.cjs
@@ -19,6 +19,7 @@ module.exports = {
     commonjs: true,
     es6: true,
   },
+  ignorePatterns: ["!**/.server", "!**/.client"],
 
   // Base config
   extends: ["eslint:recommended"],

From b85643d09e5dc58a8506d155f8c5e66cb1c82d7c Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Mon, 25 Mar 2024 12:36:17 -0400
Subject: [PATCH 028/108] Point 'splat route' links to the right doc

---
 docs/guides/migrating-react-router-app.md | 4 ++--
 docs/guides/not-found.md                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/guides/migrating-react-router-app.md b/docs/guides/migrating-react-router-app.md
index 6671c09d370..3ada2dfd318 100644
--- a/docs/guides/migrating-react-router-app.md
+++ b/docs/guides/migrating-react-router-app.md
@@ -283,7 +283,7 @@ Lastly, in your root `App` component (the one that would have been mounted to th
 
 Remix needs routes beyond the root route to know what to render in `<Outlet />`. Fortunately you already render `<Route>` components in your app, and Remix can use those as you migrate to use our [routing conventions][routing-conventions].
 
-To start, create a new directory in `app` called `routes`. In that directory, create two files called `_index.tsx` and `$.tsx`. `$.tsx` is called [a **catch-all route**][a-catch-all-route], and it will be useful to let your old app handle routes that you haven't moved into the `routes` directory yet.
+To start, create a new directory in `app` called `routes`. In that directory, create two files called `_index.tsx` and `$.tsx`. `$.tsx` is called [a **catch-all or "splat" route**][a-catch-all-route], and it will be useful to let your old app handle routes that you haven't moved into the `routes` directory yet.
 
 Inside your `_index.tsx` and `$.tsx` files, all we need to do is export the code from our old root `App`:
 
@@ -698,7 +698,7 @@ Now then, go off and _remix your app_. We think you'll like what you build along
 [backwards-compatibility-package]: https://www.npmjs.com/package/react-router-dom-v5-compat
 [a-few-tweaks-to-improve-progressive-enhancement]: ../pages/philosophy#progressive-enhancement
 [routing-conventions]: ./routing
-[a-catch-all-route]: ./routing#splats
+[a-catch-all-route]: ../file-conventions/routes#splat-routes
 [hydration-mismatch]: https://reactjs.org/docs/react-dom.html#hydrate
 [loader-data]: ../route/loader
 [client-only-component]: https://github.com/sergiodxa/remix-utils/blob/main/src/react/client-only.tsx
diff --git a/docs/guides/not-found.md b/docs/guides/not-found.md
index 2bb64f983f0..db824f78a4f 100644
--- a/docs/guides/not-found.md
+++ b/docs/guides/not-found.md
@@ -74,4 +74,4 @@ export function ErrorBoundary() {
 [error-boundary]: ../route/error-boundary
 [errors]: ./errors
 [404-status-code]: https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/404
-[splat-route]: ./routing#splats
+[splat-route]: ../file-conventions/routes#splat-routes

From 635802ad4352acff398c46c89c66ea7890198d8f Mon Sep 17 00:00:00 2001
From: Bengin Cetindere <53540163+xdivby0@users.noreply.github.com>
Date: Mon, 25 Mar 2024 18:57:01 +0100
Subject: [PATCH 029/108] Update Migration Instructions for Cloudflare Pages
 (#9118)

---
 docs/future/vite.md | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/docs/future/vite.md b/docs/future/vite.md
index 04b88f8c048..f21920d27af 100644
--- a/docs/future/vite.md
+++ b/docs/future/vite.md
@@ -453,27 +453,20 @@ The Remix Vite plugin only officially supports [Cloudflare Pages][cloudflare-pag
 
 </docs-warning>
 
-👉 **Setup the Cloudflare Remix preset, then add `"workerd"` and `"worker"` conditions**
+👉 add `cloudflareDevProxyVitePlugin` **before** `remix` plugin to correctly override vite dev server's middleware!
 
-```ts filename=vite.config.ts lines=[3,6,11,14-18]
+```ts filename=vite.config.ts lines=[3,9]
 import {
   vitePlugin as remix,
-  cloudflarePreset as cloudflare,
+  cloudflareDevProxyVitePlugin,
 } from "@remix-run/dev";
 import { defineConfig } from "vite";
-import { getBindingsProxy } from "wrangler";
 
 export default defineConfig({
   plugins: [
-    remix({
-      presets: [cloudflare(getBindingsProxy)],
-    }),
-  ],
-  ssr: {
-    resolve: {
-      externalConditions: ["workerd", "worker"],
-    },
-  },
+    cloudflareDevProxyVitePlugin(),
+    remix(),
+  ]
 });
 ```
 
@@ -487,13 +480,15 @@ Instead, you can author a catch-all route directly for Cloudflare, just like how
 import { createPagesFunctionHandler } from "@remix-run/cloudflare-pages";
 
 // @ts-ignore - the server build file is generated by `remix vite:build`
-import * as build from "../build/server";
+import * as build from "../build/server";  
 
 export const onRequest = createPagesFunctionHandler({
   build,
 });
 ```
 
+👉 **Access Bindings and Environment Variables through `context.cloudflare.env` instead of `context.env`**
+
 While you'll mostly use Vite during development, you can also use Wrangler to preview and deploy your app.
 To learn more, see [_Cloudflare > Vite & Wrangler_][cloudflare-vite-and-wrangler].
 

From 22e4a6632227122151d9e03cb7a000a2e767c8e2 Mon Sep 17 00:00:00 2001
From: Remix Run Bot <hello@remix.run>
Date: Mon, 25 Mar 2024 17:58:40 +0000
Subject: [PATCH 030/108] chore: format

---
 docs/future/vite.md | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/docs/future/vite.md b/docs/future/vite.md
index f21920d27af..49e3f6bbd45 100644
--- a/docs/future/vite.md
+++ b/docs/future/vite.md
@@ -463,10 +463,7 @@ import {
 import { defineConfig } from "vite";
 
 export default defineConfig({
-  plugins: [
-    cloudflareDevProxyVitePlugin(),
-    remix(),
-  ]
+  plugins: [cloudflareDevProxyVitePlugin(), remix()],
 });
 ```
 
@@ -480,7 +477,7 @@ Instead, you can author a catch-all route directly for Cloudflare, just like how
 import { createPagesFunctionHandler } from "@remix-run/cloudflare-pages";
 
 // @ts-ignore - the server build file is generated by `remix vite:build`
-import * as build from "../build/server";  
+import * as build from "../build/server";
 
 export const onRequest = createPagesFunctionHandler({
   build,

From 878440781095205487bc735b535ac8bc78740491 Mon Sep 17 00:00:00 2001
From: Mark Dalgleish <mark.john.dalgleish@gmail.com>
Date: Tue, 26 Mar 2024 07:00:41 +1100
Subject: [PATCH 031/108] Temporarily reinstate Vite template (#9133)

---
 templates/vite/.eslintrc.cjs         |  83 ++++++++++++++++
 templates/vite/.gitignore            |   5 +
 templates/vite/README.md             |  36 +++++++
 templates/vite/app/entry.client.tsx  |  18 ++++
 templates/vite/app/entry.server.tsx  | 140 +++++++++++++++++++++++++++
 templates/vite/app/root.tsx          |  29 ++++++
 templates/vite/app/routes/_index.tsx |  41 ++++++++
 templates/vite/package.json          |  39 ++++++++
 templates/vite/public/favicon.ico    | Bin 0 -> 16958 bytes
 templates/vite/tsconfig.json         |  32 ++++++
 templates/vite/vite.config.ts        |  10 ++
 11 files changed, 433 insertions(+)
 create mode 100644 templates/vite/.eslintrc.cjs
 create mode 100644 templates/vite/.gitignore
 create mode 100644 templates/vite/README.md
 create mode 100644 templates/vite/app/entry.client.tsx
 create mode 100644 templates/vite/app/entry.server.tsx
 create mode 100644 templates/vite/app/root.tsx
 create mode 100644 templates/vite/app/routes/_index.tsx
 create mode 100644 templates/vite/package.json
 create mode 100644 templates/vite/public/favicon.ico
 create mode 100644 templates/vite/tsconfig.json
 create mode 100644 templates/vite/vite.config.ts

diff --git a/templates/vite/.eslintrc.cjs b/templates/vite/.eslintrc.cjs
new file mode 100644
index 00000000000..c3128a897c8
--- /dev/null
+++ b/templates/vite/.eslintrc.cjs
@@ -0,0 +1,83 @@
+/**
+ * This is intended to be a basic starting point for linting in your app.
+ * It relies on recommended configs out of the box for simplicity, but you can
+ * and should modify this configuration to best suit your team's needs.
+ */
+
+/** @type {import('eslint').Linter.Config} */
+module.exports = {
+  root: true,
+  parserOptions: {
+    ecmaVersion: "latest",
+    sourceType: "module",
+    ecmaFeatures: {
+      jsx: true,
+    },
+  },
+  env: {
+    browser: true,
+    commonjs: true,
+    es6: true,
+  },
+
+  // Base config
+  extends: ["eslint:recommended"],
+
+  overrides: [
+    // React
+    {
+      files: ["**/*.{js,jsx,ts,tsx}"],
+      plugins: ["react", "jsx-a11y"],
+      extends: [
+        "plugin:react/recommended",
+        "plugin:react/jsx-runtime",
+        "plugin:react-hooks/recommended",
+        "plugin:jsx-a11y/recommended",
+      ],
+      settings: {
+        react: {
+          version: "detect",
+        },
+        formComponents: ["Form"],
+        linkComponents: [
+          { name: "Link", linkAttribute: "to" },
+          { name: "NavLink", linkAttribute: "to" },
+        ],
+        "import/resolver": {
+          typescript: {},
+        },
+      },
+    },
+
+    // Typescript
+    {
+      files: ["**/*.{ts,tsx}"],
+      plugins: ["@typescript-eslint", "import"],
+      parser: "@typescript-eslint/parser",
+      settings: {
+        "import/internal-regex": "^~/",
+        "import/resolver": {
+          node: {
+            extensions: [".ts", ".tsx"],
+          },
+          typescript: {
+            alwaysTryTypes: true,
+          },
+        },
+      },
+      extends: [
+        "plugin:@typescript-eslint/recommended",
+        "plugin:import/recommended",
+        "plugin:import/typescript",
+      ],
+    },
+
+    // Node
+    {
+      files: [".eslintrc.cjs"],
+      env: {
+        node: true,
+      },
+    },
+  ],
+};
diff --git a/templates/vite/.gitignore b/templates/vite/.gitignore
new file mode 100644
index 00000000000..80ec311f4ff
--- /dev/null
+++ b/templates/vite/.gitignore
@@ -0,0 +1,5 @@
+node_modules
+
+/.cache
+/build
+.env
diff --git a/templates/vite/README.md b/templates/vite/README.md
new file mode 100644
index 00000000000..c05e097d923
--- /dev/null
+++ b/templates/vite/README.md
@@ -0,0 +1,36 @@
+# Welcome to Remix + Vite!
+
+📖 See the [Remix docs](https://remix.run/docs) and the [Remix Vite docs](https://remix.run/docs/en/main/future/vite) for details on supported features.
+
+## Development
+
+Run the Vite dev server:
+
+```shellscript
+npm run dev
+```
+
+## Deployment
+
+First, build your app for production:
+
+```sh
+npm run build
+```
+
+Then run the app in production mode:
+
+```sh
+npm start
+```
+
+Now you'll need to pick a host to deploy it to.
+
+### DIY
+
+If you're familiar with deploying Node applications, the built-in Remix app server is production-ready.
+
+Make sure to deploy the output of `npm run build`
+
+- `build/server`
+- `build/client`
diff --git a/templates/vite/app/entry.client.tsx b/templates/vite/app/entry.client.tsx
new file mode 100644
index 00000000000..94d5dc0de0f
--- /dev/null
+++ b/templates/vite/app/entry.client.tsx
@@ -0,0 +1,18 @@
+/**
+ * By default, Remix will handle hydrating your app on the client for you.
+ * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨
+ * For more information, see https://remix.run/file-conventions/entry.client
+ */
+
+import { RemixBrowser } from "@remix-run/react";
+import { startTransition, StrictMode } from "react";
+import { hydrateRoot } from "react-dom/client";
+
+startTransition(() => {
+  hydrateRoot(
+    document,
+    <StrictMode>
+      <RemixBrowser />
+    </StrictMode>
+  );
+});
diff --git a/templates/vite/app/entry.server.tsx b/templates/vite/app/entry.server.tsx
new file mode 100644
index 00000000000..45db3229c68
--- /dev/null
+++ b/templates/vite/app/entry.server.tsx
@@ -0,0 +1,140 @@
+/**
+ * By default, Remix will handle generating the HTTP Response for you.
+ * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨
+ * For more information, see https://remix.run/file-conventions/entry.server
+ */
+
+import { PassThrough } from "node:stream";
+
+import type { AppLoadContext, EntryContext } from "@remix-run/node";
+import { createReadableStreamFromReadable } from "@remix-run/node";
+import { RemixServer } from "@remix-run/react";
+import { isbot } from "isbot";
+import { renderToPipeableStream } from "react-dom/server";
+
+const ABORT_DELAY = 5_000;
+
+export default function handleRequest(
+  request: Request,
+  responseStatusCode: number,
+  responseHeaders: Headers,
+  remixContext: EntryContext,
+  // This is ignored so we can keep it in the template for visibility.  Feel
+  // free to delete this parameter in your app if you're not using it!
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  loadContext: AppLoadContext
+) {
+  return isbot(request.headers.get("user-agent") || "")
+    ? handleBotRequest(
+        request,
+        responseStatusCode,
+        responseHeaders,
+        remixContext
+      )
+    : handleBrowserRequest(
+        request,
+        responseStatusCode,
+        responseHeaders,
+        remixContext
+      );
+}
+
+function handleBotRequest(
+  request: Request,
+  responseStatusCode: number,
+  responseHeaders: Headers,
+  remixContext: EntryContext
+) {
+  return new Promise((resolve, reject) => {
+    let shellRendered = false;
+    const { pipe, abort } = renderToPipeableStream(
+      <RemixServer
+        context={remixContext}
+        url={request.url}
+        abortDelay={ABORT_DELAY}
+      />,
+      {
+        onAllReady() {
+          shellRendered = true;
+          const body = new PassThrough();
+          const stream = createReadableStreamFromReadable(body);
+
+          responseHeaders.set("Content-Type", "text/html");
+
+          resolve(
+            new Response(stream, {
+              headers: responseHeaders,
+              status: responseStatusCode,
+            })
+          );
+
+          pipe(body);
+        },
+        onShellError(error: unknown) {
+          reject(error);
+        },
+        onError(error: unknown) {
+          responseStatusCode = 500;
+          // Log streaming rendering errors from inside the shell.  Don't log
+          // errors encountered during initial shell rendering since they'll
+          // reject and get logged in handleDocumentRequest.
+          if (shellRendered) {
+            console.error(error);
+          }
+        },
+      }
+    );
+
+    setTimeout(abort, ABORT_DELAY);
+  });
+}
+
+function handleBrowserRequest(
+  request: Request,
+  responseStatusCode: number,
+  responseHeaders: Headers,
+  remixContext: EntryContext
+) {
+  return new Promise((resolve, reject) => {
+    let shellRendered = false;
+    const { pipe, abort } = renderToPipeableStream(
+      <RemixServer
+        context={remixContext}
+        url={request.url}
+        abortDelay={ABORT_DELAY}
+      />,
+      {
+        onShellReady() {
+          shellRendered = true;
+          const body = new PassThrough();
+          const stream = createReadableStreamFromReadable(body);
+
+          responseHeaders.set("Content-Type", "text/html");
+
+          resolve(
+            new Response(stream, {
+              headers: responseHeaders,
+              status: responseStatusCode,
+            })
+          );
+
+          pipe(body);
+        },
+        onShellError(error: unknown) {
+          reject(error);
+        },
+        onError(error: unknown) {
+          responseStatusCode = 500;
+          // Log streaming rendering errors from inside the shell.  Don't log
+          // errors encountered during initial shell rendering since they'll
+          // reject and get logged in handleDocumentRequest.
+          if (shellRendered) {
+            console.error(error);
+          }
+        },
+      }
+    );
+
+    setTimeout(abort, ABORT_DELAY);
+  });
+}
diff --git a/templates/vite/app/root.tsx b/templates/vite/app/root.tsx
new file mode 100644
index 00000000000..e82f26fd179
--- /dev/null
+++ b/templates/vite/app/root.tsx
@@ -0,0 +1,29 @@
+import {
+  Links,
+  Meta,
+  Outlet,
+  Scripts,
+  ScrollRestoration,
+} from "@remix-run/react";
+
+export function Layout({ children }: { children: React.ReactNode }) {
+  return (
+    <html lang="en">
+      <head>
+        <meta charSet="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <Meta />
+        <Links />
+      </head>
+      <body>
+        {children}
+        <ScrollRestoration />
+        <Scripts />
+      </body>
+    </html>
+  );
+}
+
+export default function App() {
+  return <Outlet />;
+}
diff --git a/templates/vite/app/routes/_index.tsx b/templates/vite/app/routes/_index.tsx
new file mode 100644
index 00000000000..5347369230e
--- /dev/null
+++ b/templates/vite/app/routes/_index.tsx
@@ -0,0 +1,41 @@
+import type { MetaFunction } from "@remix-run/node";
+
+export const meta: MetaFunction = () => {
+  return [
+    { title: "New Remix App" },
+    { name: "description", content: "Welcome to Remix!" },
+  ];
+};
+
+export default function Index() {
+  return (
+    <div style={{ fontFamily: "system-ui, sans-serif", lineHeight: "1.8" }}>
+      <h1>Welcome to Remix</h1>
+      <ul>
+        <li>
+          <a
+            target="_blank"
+            href="https://remix.run/tutorials/blog"
+            rel="noreferrer"
+          >
+            15m Quickstart Blog Tutorial
+          </a>
+        </li>
+        <li>
+          <a
+            target="_blank"
+            href="https://remix.run/tutorials/jokes"
+            rel="noreferrer"
+          >
+            Deep Dive Jokes App Tutorial
+          </a>
+        </li>
+        <li>
+          <a target="_blank" href="https://remix.run/docs" rel="noreferrer">
+            Remix Docs
+          </a>
+        </li>
+      </ul>
+    </div>
+  );
+}
diff --git a/templates/vite/package.json b/templates/vite/package.json
new file mode 100644
index 00000000000..ba824c84d9c
--- /dev/null
+++ b/templates/vite/package.json
@@ -0,0 +1,39 @@
+{
+  "private": true,
+  "sideEffects": false,
+  "type": "module",
+  "scripts": {
+    "build": "remix vite:build",
+    "dev": "remix vite:dev",
+    "lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
+    "start": "remix-serve ./build/server/index.js",
+    "typecheck": "tsc"
+  },
+  "dependencies": {
+    "@remix-run/node": "*",
+    "@remix-run/react": "*",
+    "@remix-run/serve": "*",
+    "isbot": "^4.1.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
+  },
+  "devDependencies": {
+    "@remix-run/dev": "*",
+    "@types/react": "^18.2.20",
+    "@types/react-dom": "^18.2.7",
+    "@typescript-eslint/eslint-plugin": "^6.7.4",
+    "@typescript-eslint/parser": "^6.7.4",
+    "eslint": "^8.38.0",
+    "eslint-import-resolver-typescript": "^3.6.1",
+    "eslint-plugin-import": "^2.28.1",
+    "eslint-plugin-jsx-a11y": "^6.7.1",
+    "eslint-plugin-react": "^7.33.2",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "typescript": "^5.1.6",
+    "vite": "^5.1.0",
+    "vite-tsconfig-paths": "^4.2.1"
+  },
+  "engines": {
+    "node": ">=18.0.0"
+  }
+}
diff --git a/templates/vite/public/favicon.ico b/templates/vite/public/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..8830cf6821b354114848e6354889b8ecf6d2bc61
GIT binary patch
literal 16958
zcmeI3+jCXb9mnJN2h^uNlXH@jlam{_a8F3W{T}Wih>9YJpaf7TUbu)A5fv|h7OMfR
zR;q$lr&D!wv|c)`wcw1?>4QT1(&|jdsrI2h`Rn)dTW5t$8pz=s3_5L?#oBxAowe8R
z_WfPfN?F+@`q$D@rvC?(W!uWieppskmQ~YG*>*L?{img@tWpnYXZslxeh#TSUS3{q
z1Ju6JcfQSbQuORq69@YK(X-3c9vC2c2a2z~zw=F=50@pm0PUiCAm!bAT?2jpM`(^b
zC|2&Ngngt^<>oCv#<S!-dX;>?P(AZ`5_84x#QBPulix)TpkIAUp=(KgGo4CVS~Sxt
zVoR4>r5g9%bDh7hi0|v$={zr>CHd`?-l4^Ld(Z9PNz9piFY+llUw_x4ou7Vf-q%$g
z)&)J4>6Ft~RZ(uV>dJD<Ri@O+ttLaCvYPyTPWL>|`nxI1^x{X<kw8nThj+Y}tw{Or
zRjUv4hrU{KGhbGHm9Ho8JkC+BwU&#I{n0PFy7kVfbG?_+T+m-3nxQ?DUla7zinfMq
z%7#>@Z5S<=vf;V3w_(*O-7}W<=e$=}CB9_R;)m9)d7`d_xx+nl^Bg|%ew=?uoKO8w
zeQU7h;~8s!@9-k>7Cx}<bJ3N5)-UEEpLCvfc#RzR<`8{*xab{Oo3=4^71mT=VdDqW
z($=D$#(h&m+Q#bHD81KM6L?WCy3h+`$eLs0K9?!C`fS>1<o!{ao8ND$Pg}FkS7GCH
zJw}ah!*h61t2v#otd%vZ6+nN#?=TPYL0-^ar*$LiQFUQGZ9^+;N@Jx>SDQ7m(&miH
zs8!l*wOJ!GHbdh)pD--&W3+w`9YJ=;m^FtMY=`mTq8pyV!-@L6smwp3(q?G>=_4v^
zn(ikLue7!y70#2uhqUVpb7fp!=xu2{aM^1P^pts#+feZv8d~)2sf`sjXLQCEj;pdI
z%~f`JOO;*KnziMv^i_6+?mL?^wrE_&=IT9o1i!}Sd4Sx4O@w~1bi1)8<?^1W_hyQJ
z^TuRsvF7h=(){B?>(sXvYR-1?7~Zr<=SJ1Cw!i~yfi=4h6o3O~(-Sb2Ilwq%g$+V`
z>(C&N1!FV5rWF&iwt8~b)=jIn4b!XbrWrZgIHTISrdHcpjjx=TwJXI7_%Ks4oFLl9
zNT;!%!P4~xH85njXdfqgnIxIFOOKW`W$fxU%{{5wZkVF^G=JB$oUNU5dQSL&ZnR1s
z*ckJ$R`eCUJsWL>j6*+|2S1TL_J|Fl&kt=~XZF=+=iT0Xq1*KU-NuH%NAQff$LJp3
zU_*a;@7I0K{mqwux87~vwsp<}@P>KNDb}3U+6$rcZ114|QTMUSk+rhPA(b{$>pQTc
zIQri{+U>GMzsCy0Mo4BfWXJlkk;RhfpWpAB{=Rtr*d1MNC+H3Oi5+3D$gUI&AjV-1
z=0Z<L3zM*4u<g-e=|9$O^MnPHwN`w?DDl)WJ}-Op{;HO&ee}ljeagQt`n!MJWs7Ai
z;3B>Oox+bGyHe=yk-yu%=+{~&46C$ut^ZN+ysx$NH}*F43)3bKkMsxGyIl#>7Yb8W
zO{}&LUO8Ow{7>!bvSq?X{15&Y|4}0w2=o_^0ZzYgB+4HhZ4>s*mW&?RQ6&AY|CPcx
z$*LjftNS|H)ePYnIKNg{ck*|y7EJ&Co0ho0K`!{ENPkASeKy-JWE}dF_%}j)Z5a&q
zXAI2gPu6`s-@baW=*+keiE$A<b_MR?C-5PseqT8KkKDY(u92UZE4^yfJYZmLRl0Qj
z2mi$bu(VF|VOOk`m}JGAX2-zC@9eU}cdfT)cCWW1_iV7|_H3}{?+yJCT{HgFuJ!hW
z-dneDylkh+V;A%t9|&GGNe?DVALeWQ(D9>LIs5G6_X_6kgKK8n3jH2-H9`6bo)Qn1
zZ2x)xPt1=`9V|bE4*;j9$X20+xQCc$rEK<k`Fi~Hjq>|9OwH-O+Q*k`ZNw}K##SkY
z3u}aCV%V|j@!gL5(*5fuWo>JFjeU9Qqk`$bdwH8(qZovE2tA7WUpoCE=VKm^eZ|vZ
z(k<+j*mGJVah>8CkAsMD6#I$RtF;#57Wi`c_^k5?+KCmX$;Ky2*6<J=fcB~4B|ZV&
z?~?BCTu@_QfA&ei^lx3%=--_q{3EVljTZ#}J^n$D1~~>|Q^bJ8+s%2MB}OH-g$Ev^
zO3uqfGjuN%CZiu<`aCuKCh{kK!dDZ+<Fl~arF!o=>CcwgIeU2dsDfz+V>V3BDb~)~
zO!2l!_)m;ZepR~sL+-~s<YrF4FaR4!(myY+152d8&=KNvctHGLWgQw{tVX<yoWW_Z
zj-Hr!ndH7odVllGob8-nW3NBFv0(bY`1FL^9N&SL;FHHcq95!k&HtnS;-hG%hCy5j
z26`MMf5rEpW07<ly2*EzOXtyjasql9V^`87BWQ&$%XE#tlN;dgHVN~f{lTSm_O}mT
zE0})bgjJdY-h#`-)Z`P?PD;&z;T?03pC|DTyTxXaAF{>HS7;5ZB|~uUM&&5vDda2b
z)CW8S6GI*oF><|ZeY5D^+Mcsri)!tmrM33qvwI4r9o@(GlW!u2R>>sB|E#%W`c*@5
z|0iA|`{6aA7D4Q?vc1{vT-#yytn07`H!QIO^1+X7?zG3%y0<K~L$`F=p)E9B=Nsdp
zb=qM)|Jkjbc68S&dsX^=;-v%j)u|KbMf(>gPdIPUJ#s*DNAwd}m1_IMN1^T&be~+E
z_z%1W^9~dl|Me9U6+3oNyuMDkF*z_;dOG(Baa*yq;TRiw{EO~O_S6>e*L(+Cdu(TM
z@o%xTCV%hi&p)x3_inIF!b|W4|AF5p?y1j)cr9RG@v%QVaN8&LaorC-kJz_ExfVHB
za!mtuee#Vb?dh&bwrfGHYAiX&&|v$}U*UBM;#F!N=x>x|G5s0zOa9{(`=k4v^6iK3
z8d&=O@xhDs{;v7<i<J%blPl`%F2zV2g`fBkaG1Pogz882RUuz5)%QjDQ|qVROU;s)
z&2zMiK!4P)&yT-qFYjDtyBF5F{*y1vPxwCS6y&Rpe_)teF|v>JQ%eO;!Bt`&*MH&d
zp^K#dkq;jnJz%%bsqwlaKA5<gd^+Mkxi7IxDK-%BFT|4IAN4BoH1O}I%ID%*E>?fy
zS5JDbO#BgSAdi8<E3bcf{8u~%MEaSFm@4?cP}e`Oy}11ULi6hN?%l2f)C{Mn9*>NM
zDo2SifX6^Z;vn>cBh-?~r_n9qYvP|3ihrnqq6deS-#>l#dV4mX|G%L8|EL;$U+w69
z;rTK3FW$ewUfH|R-Z;3;jvpfiDm?Fvyu9PeR>wi|E8>&j2Z@2h`U}|$><c4e{h$1w
z{FfRq@#VNY57^%!w<Fg>2d`BPV3pz#ViIzH8v6pP^L-p!GbLv<;(p>}_6u&E6XO5-
zJ8JEvJ1)0>{iSd|kOQn#?0rTYL=KSmgMHCf$Qbm;7|8d(goD&T-~oCDuZf57iP#_Y
zmxaoOSjQsm*^u+m$L9AMqwi=6bpdiAY6k3akjGN{xOZ`_J<~Puyzpi7yhhKrLmXV;
z@ftONPy;Uw1F#{_fyGbk04yLE01v=i_5`RqQP+SUH0nb=O?l!J)qCSTdsbmjFJrTm
zx4^ef@qt{B+TV_OHOhtR?XT}1Etm(f21;#qyyW6FpnM+S7*M1iME?9fe8d-`Q#InN
z?^y{C_|8bxgUE@!o+Z72C)BrS&5D`gb-X8kq*1G7Uld-z19V}HY~mK#!o9MC-*#^+
znEsdc-|jj0+%cgBMy(cEkq4IQ1D*b;17Lyp>Utnsz%LRTfjQKL*vo(yJxwtw^)l|!
z7jhIDdtLB}m<l{aZcDUR3Vu-k+`XvA-r9dt!Sv$?zyM+)c*=UnSwkF9d<+EdBK`0Z
zOvSg<Db557lC(Q*`Yt{Kj07Xt>pkOIG&4@F+9cYkS5r%%jz}I0R#F4oBMf-|Jmmk*
zk^OEzF%}%5{a~kGYbFjV1n>HKC+a`;&-n*v_kD2DPP~n5(QE3C;30L<32GB*qV2z$
zWR1Kh=^1-q)P37WS6YWKlUSDe=eD^u_CV+P)q!3^{=$#b^auG<yDY{2eGgE&A8BtO
z4iN3=GdAq!6NGK#1^8e5z+BOTJyYw8ZN6Vq<F5*1vQvB~xg>S7m8zFfFS<>(e~)TG
z&uwWhSoetoe!1^<uYo6XVYh$jYq2>%)O}=6{SUcw-UQmw+i8lokRASPsbT=H|4D|(
zk^P7>TUEFho!3qXSWn$<jp767-aNC~whQ<7bkx~XU6anc7IYxL2j=)Mxg_x)9qvoF
z`x}FAA^ubCS9(wUhmE&MfARUmoSgHZc6;O0te<(<Bs#F)Ewf{<YvCDVx6mZtTa~xm
zriQQIAzi=kic!|RagNu)PQFvP&x`TjzqMDed4BN!oRJwP`eO||`2Qm5kC>m2{lHXw
zD>eN6-;wwq9(?@f^F4L2Ny5_6!d~iiA^s~(|B*lbZir-$&%)l>%Q(36yOIAu|326K
ztmBWz|MLA{Kj(H_{w2gd*nZ6a@ma(w==~EHIscEk|C=NGJa%Ruh4_+~f|%rt{I5v*
zIX@F?|KJID56-ivb+PLo(9hn_CdK{irOcL15>JNQFY112^$+}JPyI{uQ~$&E*=ri;
z`d^fH?4f=8vKHT4!p9O*fX(brB75Y9?e>T9=X#Fc@V#%@5^)~#zu5I(=>LQA-EGTS
zecy*#6gG+8lapch#Hh%vl(+}J;Q!hC1OKoo;#h3#V%5Js)tQ)|>pTT@1ojd+F9Gey
zg`B)zm`|Mo%tH31<UKv~=W{;tJ>s4=<+`Pu|B3orXwNyIcNN>;fBkIj^X8P}RXhF=
zXQK1u5RLN7k#_Q(KznJrALtMM13!vhfr025ar?@-%{l|uWt@NEd<$~n><jfS>RQL{
z+o;->n)+~0tt(u|o_9h!T`%M8%)w2awpV9b*xz9Pl-daUJm3y-HT%xg`^mFd6LBeL
z!0~s;zEr)Bn9x)I(wx`;JVwvRcc^io2XX(Nn3vr3dgbrr@YJ?K3w18P*52^ieBCQP
z=Up1V$N2~5ppJHRTeY8QfM(7Yv&RG7oWJAy<l59ZkqbHxP9b+_2e(SqeV4yuK)@1s
z%lQX#-VwqX^njWV_Q$z9&VW$+qSn=+HB*x>v?c3g(29)P)u;_o&w|&)HGDIinXT~p
z3;S|e$=&Tek9Wn!`cdY+d-w@o`37}x{(hl>ykB|%9yB$CGdIcl7Z?d&lJ%}QHck77
zJPR%C+s2w1_Dl_pxu6$Zi!`HmoD-%7OD@7%lKLL^Ixd9VlRSW*o&$^iQ2z+}hTgH)
z#91TO#+jH<`w4L}XWOt(`gqM*uTUcky`O(mEyU|4dJoy6*UZJ7%*}ajuos%~>&P2j
zk23f5<@GeV?(?`l=ih+D8t`d72xrUjv0wsg;%s1@*2p?TQ;n2$pV7h?_T%sL>iL@w
zZ{lmc<|B7!e&o!zs6RW+u8+aDyUdG>ZS(v&rT$QVymB7sEC@VsK1dg^3F@K90-wYB
zX!we79q<?(Wh~izEdPF0&->x`(6LA>F$~{{xE8-3Wzyfe`+Lsce(?uj{k@lb9<ViF
zY+O(5$+i4C_V5c{<+16E=ROu{Q$6GPT4S6q&{_K5u_V`@ycX##{0*QmV{dZ2nCqY;
zA?8S4GZ*)9&c3dbWAVLjyN70I=SO__U;F#l<Io(a5C3z2A@tzemRqUwLt}5+d-0(~
z@9;OFU}KNoe$TIui>7YTJt#>l*Z&LyKX@zjmu?UJC9w~;|NsB{%7G}y*uNDBxirfC
EKbET!0{{R3

literal 0
HcmV?d00001

diff --git a/templates/vite/tsconfig.json b/templates/vite/tsconfig.json
new file mode 100644
index 00000000000..9d87dd378f5
--- /dev/null
+++ b/templates/vite/tsconfig.json
@@ -0,0 +1,32 @@
+{
+  "include": [
+    "**/*.ts",
+    "**/*.tsx",
+    "**/.server/**/*.ts",
+    "**/.server/**/*.tsx",
+    "**/.client/**/*.ts",
+    "**/.client/**/*.tsx"
+  ],
+  "compilerOptions": {
+    "lib": ["DOM", "DOM.Iterable", "ES2022"],
+    "types": ["@remix-run/node", "vite/client"],
+    "isolatedModules": true,
+    "esModuleInterop": true,
+    "jsx": "react-jsx",
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "resolveJsonModule": true,
+    "target": "ES2022",
+    "strict": true,
+    "allowJs": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "baseUrl": ".",
+    "paths": {
+      "~/*": ["./app/*"]
+    },
+
+    // Vite takes care of building everything, not tsc.
+    "noEmit": true
+  }
+}
diff --git a/templates/vite/vite.config.ts b/templates/vite/vite.config.ts
new file mode 100644
index 00000000000..2b6aff98727
--- /dev/null
+++ b/templates/vite/vite.config.ts
@@ -0,0 +1,10 @@
+import { vitePlugin as remix } from "@remix-run/dev";
+import { installGlobals } from "@remix-run/node";
+import { defineConfig } from "vite";
+import tsconfigPaths from "vite-tsconfig-paths";
+
+installGlobals();
+
+export default defineConfig({
+  plugins: [remix(), tsconfigPaths()],
+});

From 82f50ac0f1046b4e4b574908889ee38878d9b242 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Mon, 25 Mar 2024 16:59:03 -0400
Subject: [PATCH 032/108] Fix handleDataRequest redirects in single fetch
 (#9132)

---
 integration/single-fetch-test.ts        | 248 +++++++++++++++++++++++-
 packages/remix-server-runtime/server.ts |  28 ++-
 2 files changed, 272 insertions(+), 4 deletions(-)

diff --git a/integration/single-fetch-test.ts b/integration/single-fetch-test.ts
index 6eec19ca100..30ef86e8269 100644
--- a/integration/single-fetch-test.ts
+++ b/integration/single-fetch-test.ts
@@ -90,7 +90,6 @@ test.describe("single-fetch", () => {
 
   test.beforeEach(() => {
     oldConsoleError = console.error;
-    console.error = () => {};
   });
 
   test.afterEach(() => {
@@ -138,6 +137,8 @@ test.describe("single-fetch", () => {
   });
 
   test("loads proper errors on single fetch loader requests", async () => {
+    console.error = () => {};
+
     let fixture = await createFixture(
       {
         config: {
@@ -584,6 +585,251 @@ test.describe("single-fetch", () => {
     expect(res.headers.get("x-c-headers")).toEqual("true");
   });
 
+  test("processes loader redirects", async ({ page }) => {
+    let fixture = await createFixture({
+      config: {
+        future: {
+          unstable_singleFetch: true,
+        },
+      },
+      files: {
+        ...files,
+        "app/routes/data.tsx": js`
+          import { redirect } from '@remix-run/node';
+          export function loader() {
+            return redirect('/target');
+          }
+          export default function Component() {
+            return null
+          }
+        `,
+        "app/routes/target.tsx": js`
+          export default function Component() {
+            return <h1 id="target">Target</h1>
+          }
+        `,
+      },
+    });
+    let appFixture = await createAppFixture(fixture);
+    let app = new PlaywrightFixture(appFixture, page);
+    await app.goto("/");
+    await app.clickLink("/data");
+    await page.waitForSelector("#target");
+    expect(await app.getHtml("#target")).toContain("Target");
+  });
+
+  test("processes action redirects", async ({ page }) => {
+    let fixture = await createFixture(
+      {
+        config: {
+          future: {
+            unstable_singleFetch: true,
+          },
+        },
+        files: {
+          ...files,
+          "app/routes/data.tsx": js`
+            import { redirect } from '@remix-run/node';
+            export function action() {
+              return redirect('/target');
+            }
+            export default function Component() {
+              return null
+            }
+          `,
+          "app/routes/target.tsx": js`
+            export default function Component() {
+              return <h1 id="target">Target</h1>
+            }
+          `,
+        },
+      },
+      ServerMode.Development
+    );
+    let appFixture = await createAppFixture(fixture, ServerMode.Development);
+    let app = new PlaywrightFixture(appFixture, page);
+    await app.goto("/");
+    await app.clickSubmitButton("/data");
+    await page.waitForSelector("#target");
+    expect(await app.getHtml("#target")).toContain("Target");
+  });
+
+  test("processes redirects from handleDataRequest (after loaders)", async ({
+    page,
+  }) => {
+    let fixture = await createFixture({
+      config: {
+        future: {
+          unstable_singleFetch: true,
+        },
+      },
+      files: {
+        ...files,
+        "app/entry.server.tsx": js`
+          import { PassThrough } from "node:stream";
+
+          import type { EntryContext } from "@remix-run/node";
+          import { createReadableStreamFromReadable } from "@remix-run/node";
+          import { RemixServer } from "@remix-run/react";
+          import { renderToPipeableStream } from "react-dom/server";
+
+          export default function handleRequest(
+            request: Request,
+            responseStatusCode: number,
+            responseHeaders: Headers,
+            remixContext: EntryContext
+          ) {
+            return new Promise((resolve, reject) => {
+              const { pipe } = renderToPipeableStream(
+                <RemixServer context={remixContext} url={request.url} />,
+                {
+                  onShellReady() {
+                    const body = new PassThrough();
+                    const stream = createReadableStreamFromReadable(body);
+                    responseHeaders.set("Content-Type", "text/html");
+                    resolve(
+                      new Response(stream, {
+                        headers: responseHeaders,
+                        status: responseStatusCode,
+                      })
+                    );
+                    pipe(body);
+                  },
+                  onShellError(error: unknown) {
+                    reject(error);
+                  },
+                  onError(error: unknown) {
+                    responseStatusCode = 500;
+                  },
+                }
+              );
+            });
+          }
+
+          export function handleDataRequest(response, { request }) {
+            if (request.url.endsWith("/data.data")) {
+              return new Response(null, {
+                status: 302,
+                headers: {
+                  Location: "/target",
+                },
+              });
+            }
+            return response;
+          }
+        `,
+        "app/routes/data.tsx": js`
+          import { redirect } from '@remix-run/node';
+          export function loader() {
+            return redirect('/target');
+          }
+          export default function Component() {
+            return null
+          }
+        `,
+        "app/routes/target.tsx": js`
+          export default function Component() {
+            return <h1 id="target">Target</h1>
+          }
+        `,
+      },
+    });
+    let appFixture = await createAppFixture(fixture);
+    let app = new PlaywrightFixture(appFixture, page);
+    await app.goto("/");
+    await app.clickLink("/data");
+    await page.waitForSelector("#target");
+    expect(await app.getHtml("#target")).toContain("Target");
+  });
+
+  test("processes redirects from handleDataRequest (after actions)", async ({
+    page,
+  }) => {
+    let fixture = await createFixture({
+      config: {
+        future: {
+          unstable_singleFetch: true,
+        },
+      },
+      files: {
+        ...files,
+        "app/entry.server.tsx": js`
+          import { PassThrough } from "node:stream";
+
+          import type { EntryContext } from "@remix-run/node";
+          import { createReadableStreamFromReadable } from "@remix-run/node";
+          import { RemixServer } from "@remix-run/react";
+          import { renderToPipeableStream } from "react-dom/server";
+
+          export default function handleRequest(
+            request: Request,
+            responseStatusCode: number,
+            responseHeaders: Headers,
+            remixContext: EntryContext
+          ) {
+            return new Promise((resolve, reject) => {
+              const { pipe } = renderToPipeableStream(
+                <RemixServer context={remixContext} url={request.url} />,
+                {
+                  onShellReady() {
+                    const body = new PassThrough();
+                    const stream = createReadableStreamFromReadable(body);
+                    responseHeaders.set("Content-Type", "text/html");
+                    resolve(
+                      new Response(stream, {
+                        headers: responseHeaders,
+                        status: responseStatusCode,
+                      })
+                    );
+                    pipe(body);
+                  },
+                  onShellError(error: unknown) {
+                    reject(error);
+                  },
+                  onError(error: unknown) {
+                    responseStatusCode = 500;
+                  },
+                }
+              );
+            });
+          }
+
+          export function handleDataRequest(response, { request }) {
+            if (request.url.endsWith("/data.data")) {
+              return new Response(null, {
+                status: 302,
+                headers: {
+                  Location: "/target",
+                },
+              });
+            }
+            return response;
+          }
+        `,
+        "app/routes/data.tsx": js`
+          import { redirect } from '@remix-run/node';
+          export function action() {
+            return redirect('/target');
+          }
+          export default function Component() {
+            return null
+          }
+        `,
+        "app/routes/target.tsx": js`
+          export default function Component() {
+            return <h1 id="target">Target</h1>
+          }
+        `,
+      },
+    });
+    let appFixture = await createAppFixture(fixture);
+    let app = new PlaywrightFixture(appFixture, page);
+    await app.goto("/");
+    await app.clickSubmitButton("/data");
+    await page.waitForSelector("#target");
+    expect(await app.getHtml("#target")).toContain("Target");
+  });
+
   test.describe("client loaders", () => {
     test("when no routes have client loaders", async ({ page }) => {
       let fixture = await createFixture(
diff --git a/packages/remix-server-runtime/server.ts b/packages/remix-server-runtime/server.ts
index ccf4c3e6ce4..65da52b4e39 100644
--- a/packages/remix-server-runtime/server.ts
+++ b/packages/remix-server-runtime/server.ts
@@ -80,6 +80,8 @@ function derive(build: ServerBuild, mode?: string) {
   };
 }
 
+export const SingleFetchRedirectSymbol = Symbol("SingleFetchRedirect");
+
 export const createRequestHandler: CreateRequestHandlerFunction = (
   build,
   mode
@@ -190,7 +192,29 @@ export const createRequestHandler: CreateRequestHandlerFunction = (
         });
 
         if (isRedirectResponse(response)) {
-          response = createRemixRedirectResponse(response, _build.basename);
+          let result: SingleFetchResult | SingleFetchResults =
+            getSingleFetchRedirect(response);
+
+          if (request.method === "GET") {
+            result = {
+              [SingleFetchRedirectSymbol]: result,
+            };
+          }
+          let headers = new Headers(response.headers);
+          headers.set("Content-Type", "text/x-turbo");
+
+          return new Response(
+            encodeViaTurboStream(
+              result,
+              request.signal,
+              _build.entry.module.streamTimeout,
+              serverMode
+            ),
+            {
+              status: 200,
+              headers,
+            }
+          );
         }
       }
     } else if (
@@ -300,8 +324,6 @@ async function handleDataRequest(
   }
 }
 
-export const SingleFetchRedirectSymbol = Symbol("SingleFetchRedirect");
-
 type SingleFetchRedirectResult = {
   redirect: string;
   status: number;

From 3976575eee0be86a9361a1eacf7db21d1abbd9f3 Mon Sep 17 00:00:00 2001
From: JJ <6438760+IgnusG@users.noreply.github.com>
Date: Tue, 26 Mar 2024 19:33:38 +0100
Subject: [PATCH 033/108] Fix remix-routes not transforming source maps (#8970)

Co-authored-by: Pedro Cattori <pcattori@gmail.com>
---
 .changeset/spicy-ghosts-watch.md              |  5 ++
 contributors.yml                              |  1 +
 packages/remix-dev/vite/plugin.ts             | 11 +--
 .../remix-dev/vite/remove-exports-test.ts     | 70 +++++++++----------
 packages/remix-dev/vite/remove-exports.ts     | 13 ++--
 5 files changed, 57 insertions(+), 43 deletions(-)
 create mode 100644 .changeset/spicy-ghosts-watch.md

diff --git a/.changeset/spicy-ghosts-watch.md b/.changeset/spicy-ghosts-watch.md
new file mode 100644
index 00000000000..8aca8ce40b0
--- /dev/null
+++ b/.changeset/spicy-ghosts-watch.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/dev": patch
+---
+
+Vite: added sourcemap support for transformed routes
diff --git a/contributors.yml b/contributors.yml
index 24e5047e16d..8dfa931f119 100644
--- a/contributors.yml
+++ b/contributors.yml
@@ -248,6 +248,7 @@
 - IAmLuisJ
 - iamzee
 - ianduvall
+- IgnusG
 - ikarus-akhil
 - illright
 - imzshh
diff --git a/packages/remix-dev/vite/plugin.ts b/packages/remix-dev/vite/plugin.ts
index 8dc1a266b3f..2160bcf7edf 100644
--- a/packages/remix-dev/vite/plugin.ts
+++ b/packages/remix-dev/vite/plugin.ts
@@ -1623,10 +1623,13 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
           }
         }
 
-        return {
-          code: removeExports(code, SERVER_ONLY_ROUTE_EXPORTS),
-          map: null,
-        };
+        let [filepath] = id.split("?");
+
+        return removeExports(code, SERVER_ONLY_ROUTE_EXPORTS, {
+          sourceMaps: true,
+          filename: id,
+          sourceFileName: filepath,
+        });
       },
     },
     {
diff --git a/packages/remix-dev/vite/remove-exports-test.ts b/packages/remix-dev/vite/remove-exports-test.ts
index bb52e1f8822..86af19d2c8f 100644
--- a/packages/remix-dev/vite/remove-exports-test.ts
+++ b/packages/remix-dev/vite/remove-exports-test.ts
@@ -12,11 +12,11 @@ describe("removeExports", () => {
     `,
       ["serverExport_1", "serverExport_2"]
     );
-    expect(result).toMatchInlineSnapshot(`
+    expect(result.code).toMatchInlineSnapshot(`
     "export const clientExport_1 = () => {};
     export const clientExport_2 = () => {};"
   `);
-    expect(result).not.toMatch(/server/i);
+    expect(result.code).not.toMatch(/server/i);
   });
 
   test("arrow function with dependencies", () => {
@@ -34,13 +34,13 @@ describe("removeExports", () => {
 
       export const serverExport_1 = () => serverUtil()
       export const serverExport_2 = () => serverUtil()
-      
+
       export const clientExport_1 = () => clientUtil()
       export const clientExport_2 = () => clientUtil()
     `,
       ["serverExport_1", "serverExport_2"]
     );
-    expect(result).toMatchInlineSnapshot(`
+    expect(result.code).toMatchInlineSnapshot(`
     "import { clientLib } from 'client-lib';
     import { sharedLib } from 'shared-lib';
     const sharedUtil = () => sharedLib();
@@ -48,7 +48,7 @@ describe("removeExports", () => {
     export const clientExport_1 = () => clientUtil();
     export const clientExport_2 = () => clientUtil();"
   `);
-    expect(result).not.toMatch(/server/i);
+    expect(result.code).not.toMatch(/server/i);
   });
 
   test("function statement", () => {
@@ -62,11 +62,11 @@ describe("removeExports", () => {
     `,
       ["serverExport_1", "serverExport_2"]
     );
-    expect(result).toMatchInlineSnapshot(`
+    expect(result.code).toMatchInlineSnapshot(`
     "export function clientExport_1() {}
     export function clientExport_2() {}"
   `);
-    expect(result).not.toMatch(/server/i);
+    expect(result.code).not.toMatch(/server/i);
   });
 
   test("function statement with dependencies", () => {
@@ -90,7 +90,7 @@ describe("removeExports", () => {
     `,
       ["serverExport_1", "serverExport_2"]
     );
-    expect(result).toMatchInlineSnapshot(`
+    expect(result.code).toMatchInlineSnapshot(`
     "import { clientLib } from 'client-lib';
     import { sharedLib } from 'shared-lib';
     function sharedUtil() {
@@ -106,7 +106,7 @@ describe("removeExports", () => {
       return clientUtil();
     }"
   `);
-    expect(result).not.toMatch(/server/i);
+    expect(result.code).not.toMatch(/server/i);
   });
 
   test("object", () => {
@@ -120,11 +120,11 @@ describe("removeExports", () => {
     `,
       ["serverExport_1", "serverExport_2"]
     );
-    expect(result).toMatchInlineSnapshot(`
+    expect(result.code).toMatchInlineSnapshot(`
     "export const clientExport_1 = {};
     export const clientExport_2 = {};"
   `);
-    expect(result).not.toMatch(/server/i);
+    expect(result.code).not.toMatch(/server/i);
   });
 
   test("object with dependencies", () => {
@@ -148,7 +148,7 @@ describe("removeExports", () => {
     `,
       ["serverExport_1", "serverExport_2"]
     );
-    expect(result).toMatchInlineSnapshot(`
+    expect(result.code).toMatchInlineSnapshot(`
     "import { clientLib } from 'client-lib';
     import { sharedLib } from 'shared-lib';
     const sharedUtil = () => sharedLib();
@@ -160,7 +160,7 @@ describe("removeExports", () => {
       value: clientUtil()
     };"
   `);
-    expect(result).not.toMatch(/server/i);
+    expect(result.code).not.toMatch(/server/i);
   });
 
   test("function call", () => {
@@ -174,11 +174,11 @@ describe("removeExports", () => {
     `,
       ["serverExport_1", "serverExport_2"]
     );
-    expect(result).toMatchInlineSnapshot(`
+    expect(result.code).toMatchInlineSnapshot(`
     "export const clientExport_1 = globalFunction();
     export const clientExport_2 = globalFunction();"
   `);
-    expect(result).not.toMatch(/server/i);
+    expect(result.code).not.toMatch(/server/i);
   });
 
   test("function call with dependencies", () => {
@@ -202,7 +202,7 @@ describe("removeExports", () => {
     `,
       ["serverExport_1", "serverExport_2"]
     );
-    expect(result).toMatchInlineSnapshot(`
+    expect(result.code).toMatchInlineSnapshot(`
     "import { clientLib } from 'client-lib';
     import { sharedLib } from 'shared-lib';
     const sharedUtil = () => sharedLib();
@@ -210,7 +210,7 @@ describe("removeExports", () => {
     export const clientExport_1 = clientUtil();
     export const clientExport_2 = clientUtil();"
   `);
-    expect(result).not.toMatch(/server/i);
+    expect(result.code).not.toMatch(/server/i);
   });
 
   test("iife", () => {
@@ -224,11 +224,11 @@ describe("removeExports", () => {
     `,
       ["serverExport_1", "serverExport_2"]
     );
-    expect(result).toMatchInlineSnapshot(`
+    expect(result.code).toMatchInlineSnapshot(`
     "export const clientExport_1 = (() => {})();
     export const clientExport_2 = (() => {})();"
   `);
-    expect(result).not.toMatch(/server/i);
+    expect(result.code).not.toMatch(/server/i);
   });
 
   test("iife with dependencies", () => {
@@ -252,7 +252,7 @@ describe("removeExports", () => {
     `,
       ["serverExport_1", "serverExport_2"]
     );
-    expect(result).toMatchInlineSnapshot(`
+    expect(result.code).toMatchInlineSnapshot(`
     "import { clientLib } from 'client-lib';
     import { sharedLib } from 'shared-lib';
     const sharedUtil = () => sharedLib();
@@ -260,7 +260,7 @@ describe("removeExports", () => {
     export const clientExport_1 = (() => clientUtil())();
     export const clientExport_2 = (() => clientUtil())();"
   `);
-    expect(result).not.toMatch(/server/i);
+    expect(result.code).not.toMatch(/server/i);
   });
 
   test("re-export", () => {
@@ -274,11 +274,11 @@ describe("removeExports", () => {
     `,
       ["serverExport_1", "serverExport_2"]
     );
-    expect(result).toMatchInlineSnapshot(`
+    expect(result.code).toMatchInlineSnapshot(`
     "export { clientExport_1 } from './client/1';
     export { clientExport_2 } from './client/2';"
   `);
-    expect(result).not.toMatch(/server/i);
+    expect(result.code).not.toMatch(/server/i);
   });
 
   test("re-export multiple", () => {
@@ -290,10 +290,10 @@ describe("removeExports", () => {
     `,
       ["serverExport_1", "serverExport_2"]
     );
-    expect(result).toMatchInlineSnapshot(
+    expect(result.code).toMatchInlineSnapshot(
       "\"export { clientExport_1, clientExport_2 } from './client';\""
     );
-    expect(result).not.toMatch(/server/i);
+    expect(result.code).not.toMatch(/server/i);
   });
 
   test("re-export manual", () => {
@@ -312,13 +312,13 @@ describe("removeExports", () => {
     `,
       ["serverExport_1", "serverExport_2"]
     );
-    expect(result).toMatchInlineSnapshot(`
+    expect(result.code).toMatchInlineSnapshot(`
     "import { clientExport_1 } from './client/1';
     import { clientExport_2 } from './client/2';
     export { clientExport_1 };
     export { clientExport_2 };"
   `);
-    expect(result).not.toMatch(/server/i);
+    expect(result.code).not.toMatch(/server/i);
   });
 
   test("number", () => {
@@ -332,11 +332,11 @@ describe("removeExports", () => {
     `,
       ["serverExport_1", "serverExport_2"]
     );
-    expect(result).toMatchInlineSnapshot(`
+    expect(result.code).toMatchInlineSnapshot(`
     "export const clientExport_1 = 123;
     export const clientExport_2 = 123;"
   `);
-    expect(result).not.toMatch(/server/i);
+    expect(result.code).not.toMatch(/server/i);
   });
 
   test("string", () => {
@@ -350,11 +350,11 @@ describe("removeExports", () => {
     `,
       ["serverExport_1", "serverExport_2"]
     );
-    expect(result).toMatchInlineSnapshot(`
+    expect(result.code).toMatchInlineSnapshot(`
     "export const clientExport_1 = 'string';
     export const clientExport_2 = 'string';"
   `);
-    expect(result).not.toMatch(/server/i);
+    expect(result.code).not.toMatch(/server/i);
   });
 
   test("string reference", () => {
@@ -371,12 +371,12 @@ describe("removeExports", () => {
     `,
       ["serverExport_1", "serverExport_2"]
     );
-    expect(result).toMatchInlineSnapshot(`
+    expect(result.code).toMatchInlineSnapshot(`
     "const CLIENT_STRING = 'CLIENT_STRING';
     export const clientExport_1 = CLIENT_STRING;
     export const clientExport_2 = CLIENT_STRING;"
   `);
-    expect(result).not.toMatch(/server/i);
+    expect(result.code).not.toMatch(/server/i);
   });
 
   test("null", () => {
@@ -390,10 +390,10 @@ describe("removeExports", () => {
     `,
       ["serverExport_1", "serverExport_2"]
     );
-    expect(result).toMatchInlineSnapshot(`
+    expect(result.code).toMatchInlineSnapshot(`
     "export const clientExport_1 = null;
     export const clientExport_2 = null;"
   `);
-    expect(result).not.toMatch(/server/i);
+    expect(result.code).not.toMatch(/server/i);
   });
 });
diff --git a/packages/remix-dev/vite/remove-exports.ts b/packages/remix-dev/vite/remove-exports.ts
index cb5da87b9a6..298d2cac869 100644
--- a/packages/remix-dev/vite/remove-exports.ts
+++ b/packages/remix-dev/vite/remove-exports.ts
@@ -1,5 +1,7 @@
 // Adapted from https://github.com/egoist/babel-plugin-eliminator/blob/d29859396b7708b7f7abbacdd951cbbc80902f00/src/index.ts
 // Which was originally adapted from https://github.com/vercel/next.js/blob/574fe0b582d5cc1b13663121fd47a3d82deaaa17/packages/next/build/babel/plugins/next-ssg-transform.ts
+import type { GeneratorOptions } from "@babel/generator";
+
 import {
   type BabelTypes,
   type NodePath,
@@ -61,9 +63,12 @@ function isIdentifierReferenced(
   return false;
 }
 
-export const removeExports = (source: string, exportsToRemove: string[]) => {
+export const removeExports = (
+  source: string,
+  exportsToRemove: string[],
+  generateOptions: GeneratorOptions = {}
+) => {
   let document = parse(source, { sourceType: "module" });
-  let generateCode = () => generate(document).code;
 
   let referencedIdentifiers = new Set<NodePath<BabelTypes.Identifier>>();
   let removedExports = new Set<string>();
@@ -213,7 +218,7 @@ export const removeExports = (source: string, exportsToRemove: string[]) => {
   if (removedExports.size === 0) {
     // No server-specific exports found so there's
     // no need to remove unused references
-    return generateCode();
+    return generate(document, generateOptions);
   }
 
   let referencesRemovedInThisPass: number;
@@ -359,5 +364,5 @@ export const removeExports = (source: string, exportsToRemove: string[]) => {
     });
   } while (referencesRemovedInThisPass);
 
-  return generateCode();
+  return generate(document, generateOptions);
 };

From 1fa128c3f161d92accfdf99f62a527e88daffc87 Mon Sep 17 00:00:00 2001
From: Nathan Rajlich <n@n8.io>
Date: Tue, 26 Mar 2024 16:45:46 -0700
Subject: [PATCH 034/108] Allow `.` in create-remix `--template` repo name
 (#9026)

---
 .changeset/curvy-seahorses-jog.md      | 5 +++++
 contributors.yml                       | 1 +
 packages/create-remix/copy-template.ts | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/curvy-seahorses-jog.md

diff --git a/.changeset/curvy-seahorses-jog.md b/.changeset/curvy-seahorses-jog.md
new file mode 100644
index 00000000000..7365d23875f
--- /dev/null
+++ b/.changeset/curvy-seahorses-jog.md
@@ -0,0 +1,5 @@
+---
+"create-remix": patch
+---
+
+Allow `.` in repo name when using `--template` flag
diff --git a/contributors.yml b/contributors.yml
index 8dfa931f119..8aa3c50cc05 100644
--- a/contributors.yml
+++ b/contributors.yml
@@ -607,6 +607,7 @@
 - tomer-yechiel
 - TomerAberbach
 - TomVance
+- TooTallNate
 - toufiqnuur
 - toyozaki
 - TrySound
diff --git a/packages/create-remix/copy-template.ts b/packages/create-remix/copy-template.ts
index 88f65fb500b..aa97e30c7ff 100644
--- a/packages/create-remix/copy-template.ts
+++ b/packages/create-remix/copy-template.ts
@@ -423,7 +423,7 @@ function isGithubRepoShorthand(value: string) {
   // remix-run/remix
   // remix-run/remix/templates/express
   // remix-run/examples/socket.io
-  return /^[\w-]+\/[\w-]+(\/[\w-.]+)*$/.test(value);
+  return /^[\w-]+\/[\w-.]+(\/[\w-.]+)*$/.test(value);
 }
 
 function isGithubReleaseAssetUrl(url: string) {

From 23e6c0cbf28e99b155f59d5b0fe560a146142f2a Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Wed, 27 Mar 2024 10:25:04 -0400
Subject: [PATCH 035/108] Update single fetch headers approach to use response
 stub API (#9142)

Co-authored-by: Jacob Ebey <jacob.ebey@live.com>
---
 .changeset/response-stub.md                   |  25 +
 integration/error-boundary-test.ts            |  16 +-
 integration/package.json                      |   2 +-
 integration/revalidate-test.ts                |   6 +-
 integration/single-fetch-test.ts              | 870 ++++++++++++++++--
 packages/remix-dev/package.json               |   2 +-
 packages/remix-react/package.json             |   6 +-
 packages/remix-react/single-fetch.tsx         |  15 +-
 packages/remix-server-runtime/data.ts         |  11 +-
 packages/remix-server-runtime/headers.ts      |   7 +-
 packages/remix-server-runtime/package.json    |   2 +-
 packages/remix-server-runtime/routeModules.ts |  20 +
 packages/remix-server-runtime/routes.ts       |  18 +-
 packages/remix-server-runtime/server.ts       | 339 +++++--
 packages/remix-testing/package.json           |   4 +-
 pnpm-lock.yaml                                |  50 +-
 scripts/bump-router-versions.sh               |   2 +-
 17 files changed, 1178 insertions(+), 217 deletions(-)
 create mode 100644 .changeset/response-stub.md

diff --git a/.changeset/response-stub.md b/.changeset/response-stub.md
new file mode 100644
index 00000000000..cef4c45e9a7
--- /dev/null
+++ b/.changeset/response-stub.md
@@ -0,0 +1,25 @@
+---
+"@remix-run/server-runtime": patch
+---
+
+Add `ResponseStub` header interface for single fetch and deprecate the `headers` export
+
+- The `headers` export is no longer used when single fetch is enabled
+- `loader`/`action` functions now receive a mutable `response` parameter
+  - `type ResponseStub = { status: numbers | undefined, headers: Headers }`
+- To alter the status of a response, set the `status` field directly
+  - `response.status = 201`
+- To set headers on the Response, you may use:
+  - `response.headers.set`
+  - `response.headers.append`
+  - `response.headers.delete`
+- Each `loader`/`action`receives it's own unique `response` instance so you cannot see what other `loader`/`action` functions have set (which would be subject to race conditions)
+- If all status codes are unset or have values <200, the deepest status code will be used for the HTTP response
+- If any status codes are set to a value >=300, the highest >=300 value will be used for the HTTP Response
+- Remix tracks header operations and will replay them in order (action if present, then loaders top-down) after all handlers have completed on a fresh `Headers` instance that will be applied to the HTTP Response
+  - `headers.set` on any child handler will overwrite values from parent handlers
+  - `headers.append` can be used to set the same header from both a parent and child handler
+  - `headers.delete` can be used to delete a value set by a parent handler, but not a value set from a child handler
+- Because single fetch supports naked object returns, and you no longer need to return a `Response` instance to set status/headers, the `json`/`redirect`/`redirectDocument`/`defer` utilities are considered deprecated when using Single Fetch
+- You may still continue returning normal `Response` instances and they'll apply status codes in the same way, and will apply all headers via `headers.set` - overwriting any same-named header values from parents
+  - If you need to append, you will need to switch from returning a `Response` instance to using the new `response` parameter
diff --git a/integration/error-boundary-test.ts b/integration/error-boundary-test.ts
index 9d2166baa62..dadfa3d31cf 100644
--- a/integration/error-boundary-test.ts
+++ b/integration/error-boundary-test.ts
@@ -2229,9 +2229,19 @@ test.describe("single fetch", () => {
         expect(await app.getHtml("#parent-error")).toEqual(
           '<p id="parent-error">Broken!</p>'
         );
-        expect(await app.getHtml("#parent-matches-data")).toEqual(
-          '<p id="parent-matches-data"></p>'
-        );
+        if (javaScriptEnabled) {
+          // This data remains in single fetch with JS because we don't revalidate
+          // due to the 500 action response
+          expect(await app.getHtml("#parent-matches-data")).toEqual(
+            '<p id="parent-matches-data">PARENT</p>'
+          );
+        } else {
+          // But without JS document requests call all loaders up to the
+          // boundary route so parent's data clears out
+          expect(await app.getHtml("#parent-matches-data")).toEqual(
+            '<p id="parent-matches-data"></p>'
+          );
+        }
         expect(await app.getHtml("#parent-data")).toEqual(
           '<p id="parent-data"></p>'
         );
diff --git a/integration/package.json b/integration/package.json
index a7d0b877a37..619a96c8707 100644
--- a/integration/package.json
+++ b/integration/package.json
@@ -14,7 +14,7 @@
     "@remix-run/dev": "workspace:*",
     "@remix-run/express": "workspace:*",
     "@remix-run/node": "workspace:*",
-    "@remix-run/router": "0.0.0-experimental-c7dd3d3a",
+    "@remix-run/router": "0.0.0-experimental-0f302655",
     "@remix-run/server-runtime": "workspace:*",
     "@types/express": "^4.17.9",
     "@vanilla-extract/css": "^1.10.0",
diff --git a/integration/revalidate-test.ts b/integration/revalidate-test.ts
index 92019b472a0..8830e977a2c 100644
--- a/integration/revalidate-test.ts
+++ b/integration/revalidate-test.ts
@@ -326,9 +326,9 @@ test.describe("single fetch", () => {
                           <li><Link to="/">/</Link></li>
                           <li><Link to="/parent">/parent</Link></li>
                           <li><Link to="/parent/child">/parent/child</Link></li>
-                          <li><Link to="/parent/child?revalidate=parent">/parent/child</Link></li>
-                          <li><Link to="/parent/child?revalidate=child">/parent/child</Link></li>
-                          <li><Link to="/parent/child?revalidate=parent,child">/parent/child</Link></li>
+                          <li><Link to="/parent/child?revalidate=parent">/parent/child?revalidate=parent</Link></li>
+                          <li><Link to="/parent/child?revalidate=child">/parent/child?revalidate=child</Link></li>
+                          <li><Link to="/parent/child?revalidate=parent,child">/parent/child?revalidate=parent,child</Link></li>
                         </ul>
                       </nav>
                       <Outlet />
diff --git a/integration/single-fetch-test.ts b/integration/single-fetch-test.ts
index 30ef86e8269..c571d63f46e 100644
--- a/integration/single-fetch-test.ts
+++ b/integration/single-fetch-test.ts
@@ -151,6 +151,8 @@ test.describe("single-fetch", () => {
       ServerMode.Development
     );
 
+    console.error = () => {};
+
     let res = await fixture.requestSingleFetchData("/data.data?error=true");
     expect(res.data).toEqual({
       root: {
@@ -332,19 +334,23 @@ test.describe("single-fetch", () => {
         "app/routes/action.tsx": js`
           import { Form, Link, useActionData, useLoaderData, useNavigation } from '@remix-run/react';
 
-          export async function action({ request }) {
+          export async function action({ request, response }) {
             let fd = await request.formData();
             if (fd.get('throw') === "5xx") {
-              throw new Response("Thrown 500", { status: 500 });
+              response.status = 500;
+              throw new Error("Thrown 500");
             }
             if (fd.get('throw') === "4xx") {
-              throw new Response("Thrown 400", { status: 400 });
+              response.status = 400;
+              throw new Error("Thrown 400");
             }
             if (fd.get('return') === "5xx") {
-              return new Response("Returned 500", { status: 500 });
+              response.status = 500;
+              return "Returned 500";
             }
             if (fd.get('return') === "4xx") {
-              return new Response("Returned 400", { status: 400 });
+              response.status = 400;
+              return "Returned 400";
             }
             return null;
           }
@@ -359,7 +365,7 @@ test.describe("single-fetch", () => {
             let data = useLoaderData();
             return (
               <Form method="post">
-                <button type="submit" name="throw" value="5xx">Throw 5x</button>
+                <button type="submit" name="throw" value="5xx">Throw 5xx</button>
                 <button type="submit" name="throw" value="4xx">Throw 4xx</button>
                 <button type="submit" name="return" value="5xx">Return 5xx</button>
                 <button type="submit" name="return" value="4xx">Return 4xx</button>
@@ -388,6 +394,8 @@ test.describe("single-fetch", () => {
       }
     });
 
+    console.error = () => {};
+
     let appFixture = await createAppFixture(fixture);
     let app = new PlaywrightFixture(appFixture, page);
     await app.goto("/action");
@@ -407,6 +415,7 @@ test.describe("single-fetch", () => {
     await page.click('button[name="throw"][value="5xx"]');
     await page.waitForSelector("#error");
     expect(urls).toEqual([]);
+
     await app.clickLink("/action");
     await page.waitForSelector("#data");
     expect(await app.getHtml("#data")).toContain("2");
@@ -417,7 +426,7 @@ test.describe("single-fetch", () => {
     expect(urls).toEqual([]);
   });
 
-  test("handles headers correctly for loader and action calls", async () => {
+  test("returns headers correctly for singular loader and action calls", async () => {
     let fixture = await createFixture({
       config: {
         future: {
@@ -427,24 +436,22 @@ test.describe("single-fetch", () => {
       files: {
         ...files,
         "app/routes/headers.tsx": js`
-          export function headers({ loaderHeaders }) {
-            let headers = new Headers(loaderHeaders);
-            headers.set('x-headers-function', 'true')
-            return headers;
-          }
-
-          export function action({ request }) {
+          export function action({ request, response }) {
             if (new URL(request.url).searchParams.has("error")) {
-              throw new Response(null, { headers: { "x-action-error": "true" } });
+              response.headers.set("x-action-error", "true");
+              throw response;
             }
-            return new Response(null, { headers: { "x-action": "true" } });
+            response.headers.set("x-action", "true");
+            return null;
           }
 
-          export function loader({ request }) {
+          export function loader({ request, response }) {
             if (new URL(request.url).searchParams.has("error")) {
-              throw new Response(null, { headers: { "x-loader-error": "true" } });
+              response.headers.set("x-loader-error", "true");
+              throw response;
             }
-            return new Response(null, { headers: { "x-loader": "true" } });
+            response.headers.set("x-loader", "true");
+            return null;
           }
 
           export default function Comp() {
@@ -454,30 +461,46 @@ test.describe("single-fetch", () => {
       },
     });
 
-    let res = await fixture.requestSingleFetchData("/headers.data");
-    expect(res.headers.get("x-loader")).toEqual("true");
-    expect(res.headers.get("x-headers-function")).toEqual("true");
+    // Loader
+    let docResponse = await fixture.requestDocument("/headers");
+    let dataResponse = await fixture.requestSingleFetchData("/headers.data");
+    expect(docResponse.headers.get("x-loader")).toEqual("true");
+    expect(dataResponse.headers.get("x-loader")).toEqual("true");
 
-    res = await fixture.requestSingleFetchData("/headers.data", {
+    // Action
+    docResponse = await fixture.requestDocument("/headers", {
       method: "post",
       body: null,
     });
-    expect(res.headers.get("x-action")).toEqual("true");
-    expect(res.headers.get("x-headers-function")).toEqual(null);
+    dataResponse = await fixture.requestSingleFetchData("/headers.data", {
+      method: "post",
+      body: null,
+    });
+    expect(docResponse.headers.get("x-action")).toEqual("true");
+    expect(dataResponse.headers.get("x-action")).toEqual("true");
 
-    res = await fixture.requestSingleFetchData("/headers.data?error");
-    expect(res.headers.get("x-loader-error")).toEqual("true");
-    expect(res.headers.get("x-headers-function")).toEqual("true");
+    console.error = () => {};
 
-    res = await fixture.requestSingleFetchData("/headers.data?error", {
+    // Loader Error
+    docResponse = await fixture.requestDocument("/headers?error");
+    dataResponse = await fixture.requestSingleFetchData("/headers.data?error");
+    expect(docResponse.headers.get("x-loader-error")).toEqual("true");
+    expect(dataResponse.headers.get("x-loader-error")).toEqual("true");
+
+    // Action Error
+    docResponse = await fixture.requestDocument("/headers?error", {
+      method: "post",
+      body: null,
+    });
+    dataResponse = await fixture.requestSingleFetchData("/headers.data?error", {
       method: "post",
       body: null,
     });
-    expect(res.headers.get("x-action-error")).toEqual("true");
-    expect(res.headers.get("x-headers-function")).toEqual(null);
+    expect(docResponse.headers.get("x-action-error")).toEqual("true");
+    expect(dataResponse.headers.get("x-action-error")).toEqual("true");
   });
 
-  test("scopes loader headers to the _routes param if present", async () => {
+  test("merges headers from nested routes", async () => {
     let fixture = await createFixture({
       config: {
         future: {
@@ -487,14 +510,275 @@ test.describe("single-fetch", () => {
       files: {
         ...files,
         "app/routes/a.tsx": js`
-          export function headers({ loaderHeaders }) {
-            let headers = new Headers(loaderHeaders);
-            headers.set('x-a-headers', 'true')
-            return headers;
+          export function loader({ request, response }) {
+            response.headers.set('x-one', 'a set');
+            response.headers.append('x-one', 'a append');
+            response.headers.set('x-two', 'a set');
+            response.headers.append('x-three', 'a append');
+            response.headers.set('x-four', 'a set');
+            return null;
+          }
+
+          export default function Comp() {
+            return null;
+          }
+        `,
+        "app/routes/a.b.tsx": js`
+          export function loader({ request, response }) {
+            response.headers.set('x-one', 'b set');
+            response.headers.append('x-one', 'b append');
+            response.headers.set('x-two', 'b set');
+            response.headers.append('x-three', 'b append');
+            response.headers.delete('x-four');
+            return null;
           }
 
-          export function loader({ request }) {
-            return new Response(null, { headers: { "x-a-loader": "true" } });
+          export default function Comp() {
+            return null;
+          }
+        `,
+        "app/routes/a.b.c.tsx": js`
+          export function action({ request, response }) {
+            response.headers.set('x-one', 'c action set');
+            response.headers.append('x-one', 'c action append');
+            response.headers.set('x-two', 'c action set');
+            response.headers.append('x-three', 'c action append');
+            response.headers.set('x-four', 'c action set');
+            return null;
+          }
+
+          export function loader({ request, response }) {
+            response.headers.set('x-one', 'c set');
+            response.headers.append('x-one', 'c append');
+            response.headers.set('x-two', 'c set');
+            response.headers.append('x-three', 'c append');
+            return null;
+          }
+
+          export default function Comp() {
+            return null;
+          }
+        `,
+      },
+    });
+
+    // x-one uses both set and append
+    // x-two only uses set
+    // x-three only uses append
+    // x-four deletes
+    let res: Awaited<
+      ReturnType<
+        typeof fixture.requestDocument | typeof fixture.requestSingleFetchData
+      >
+    >;
+    res = await fixture.requestDocument("/a");
+    expect(res.headers.get("x-one")).toEqual("a set, a append");
+    expect(res.headers.get("x-two")).toEqual("a set");
+    expect(res.headers.get("x-three")).toEqual("a append");
+    expect(res.headers.get("x-four")).toEqual("a set");
+
+    res = await fixture.requestSingleFetchData("/a.data");
+    expect(res.headers.get("x-one")).toEqual("a set, a append");
+    expect(res.headers.get("x-two")).toEqual("a set");
+    expect(res.headers.get("x-three")).toEqual("a append");
+    expect(res.headers.get("x-four")).toEqual("a set");
+
+    res = await fixture.requestDocument("/a/b");
+    expect(res.headers.get("x-one")).toEqual("b set, b append");
+    expect(res.headers.get("x-two")).toEqual("b set");
+    expect(res.headers.get("x-three")).toEqual("a append, b append");
+    expect(res.headers.get("x-four")).toEqual(null);
+
+    res = await fixture.requestSingleFetchData("/a/b.data");
+    expect(res.headers.get("x-one")).toEqual("b set, b append");
+    expect(res.headers.get("x-two")).toEqual("b set");
+    expect(res.headers.get("x-three")).toEqual("a append, b append");
+    expect(res.headers.get("x-four")).toEqual(null);
+
+    res = await fixture.requestDocument("/a/b/c");
+    expect(res.headers.get("x-one")).toEqual("c set, c append");
+    expect(res.headers.get("x-two")).toEqual("c set");
+    expect(res.headers.get("x-three")).toEqual("a append, b append, c append");
+    expect(res.headers.get("x-four")).toEqual(null);
+
+    res = await fixture.requestSingleFetchData("/a/b/c.data");
+    expect(res.headers.get("x-one")).toEqual("c set, c append");
+    expect(res.headers.get("x-two")).toEqual("c set");
+    expect(res.headers.get("x-three")).toEqual("a append, b append, c append");
+    expect(res.headers.get("x-four")).toEqual(null);
+
+    // Fine-grained revalidation
+    res = await fixture.requestDocument("/a/b/c.data?_routes=routes%2Fa");
+    expect(res.headers.get("x-one")).toEqual("a set, a append");
+    expect(res.headers.get("x-two")).toEqual("a set");
+    expect(res.headers.get("x-three")).toEqual("a append");
+    expect(res.headers.get("x-four")).toEqual("a set");
+
+    res = await fixture.requestDocument(
+      "/a/b.data?_routes=routes%2Fa,routes%2Fa.b"
+    );
+    expect(res.headers.get("x-one")).toEqual("b set, b append");
+    expect(res.headers.get("x-two")).toEqual("b set");
+    expect(res.headers.get("x-three")).toEqual("a append, b append");
+    expect(res.headers.get("x-four")).toEqual(null);
+
+    res = await fixture.requestDocument("/a/b/c.data?_routes=routes%2Fa.b.c");
+    expect(res.headers.get("x-one")).toEqual("c set, c append");
+    expect(res.headers.get("x-two")).toEqual("c set");
+    expect(res.headers.get("x-three")).toEqual("c append");
+    expect(res.headers.get("x-four")).toEqual(null);
+
+    res = await fixture.requestDocument(
+      "/a/b/c.data?_routes=routes%2Fa,routes%2Fa.b.c"
+    );
+    expect(res.headers.get("x-one")).toEqual("c set, c append");
+    expect(res.headers.get("x-two")).toEqual("c set");
+    expect(res.headers.get("x-three")).toEqual("a append, c append");
+    expect(res.headers.get("x-four")).toEqual("a set");
+
+    // Action only - single fetch request
+    res = await fixture.requestSingleFetchData("/a/b/c.data", {
+      method: "post",
+      body: null,
+    });
+    expect(res.headers.get("x-one")).toEqual("c action set, c action append");
+    expect(res.headers.get("x-two")).toEqual("c action set");
+    expect(res.headers.get("x-three")).toEqual("c action append");
+    expect(res.headers.get("x-four")).toEqual("c action set");
+
+    // Actions and Loaders - Document request
+    res = await fixture.requestDocument("/a/b/c", {
+      method: "post",
+      body: null,
+    });
+    expect(res.headers.get("x-one")).toEqual("c set, c append");
+    expect(res.headers.get("x-two")).toEqual("c set");
+    expect(res.headers.get("x-three")).toEqual(
+      "c action append, a append, b append, c append"
+    );
+    expect(res.headers.get("x-four")).toEqual(null);
+  });
+
+  test("merges status codes from nested routes", async () => {
+    let fixture = await createFixture({
+      config: {
+        future: {
+          unstable_singleFetch: true,
+        },
+      },
+      files: {
+        ...files,
+        "app/routes/a.tsx": js`
+          export function loader({ request, response }) {
+            if (new URL(request.url).searchParams.has("error")) {
+              response.status = 401
+            } else {
+              response.status = 201
+            }
+            return null;
+          }
+
+          export default function Comp() {
+            return null;
+          }
+        `,
+        "app/routes/a.b.tsx": js`
+          export function loader({ request, response }) {
+            response.status = 202
+            return null;
+          }
+
+          export default function Comp() {
+            return null;
+          }
+        `,
+        "app/routes/a.b.c.tsx": js`
+          export function action({ request, response }) {
+            response.status = 206
+            return null;
+          }
+
+          export function loader({ request, response }) {
+            response.status = 203
+            return null;
+          }
+
+          export default function Comp() {
+            return null;
+          }
+        `,
+      },
+    });
+
+    // Loaders
+    let res: Awaited<
+      ReturnType<
+        typeof fixture.requestDocument | typeof fixture.requestSingleFetchData
+      >
+    >;
+    res = await fixture.requestDocument("/a");
+    expect(res.status).toEqual(201);
+
+    res = await fixture.requestSingleFetchData("/a.data");
+    expect(res.status).toEqual(201);
+
+    res = await fixture.requestDocument("/a/b");
+    expect(res.status).toEqual(202);
+
+    res = await fixture.requestSingleFetchData("/a/b.data");
+    expect(res.status).toEqual(202);
+
+    res = await fixture.requestDocument("/a/b/c");
+    expect(res.status).toEqual(203);
+
+    res = await fixture.requestSingleFetchData("/a/b/c.data");
+    expect(res.status).toEqual(203);
+
+    // Errors
+    res = await fixture.requestDocument("/a?error");
+    expect(res.status).toEqual(401);
+
+    res = await fixture.requestSingleFetchData("/a.data?error");
+    expect(res.status).toEqual(401);
+
+    res = await fixture.requestDocument("/a/b?error");
+    expect(res.status).toEqual(401);
+
+    res = await fixture.requestSingleFetchData("/a/b.data?error");
+    expect(res.status).toEqual(401);
+
+    // Actions
+    res = await fixture.requestDocument("/a/b/c", {
+      method: "post",
+      body: null,
+    });
+    expect(res.status).toEqual(206);
+
+    res = await fixture.requestSingleFetchData("/a/b/c.data", {
+      method: "post",
+      body: null,
+    });
+    expect(res.status).toEqual(206);
+  });
+
+  test("merges headers from nested routes when raw Responses are returned", async () => {
+    let fixture = await createFixture({
+      config: {
+        future: {
+          unstable_singleFetch: true,
+        },
+      },
+      files: {
+        ...files,
+        "app/routes/a.tsx": js`
+          export function loader({ request}) {
+            let headers = new Headers();
+            headers.set('x-one', 'a set');
+            headers.append('x-one', 'a append');
+            headers.set('x-two', 'a set');
+            headers.append('x-three', 'a append');
+            headers.set('x-four', 'a set');
+            return new Response(null, { headers });
           }
 
           export default function Comp() {
@@ -502,15 +786,112 @@ test.describe("single-fetch", () => {
           }
         `,
         "app/routes/a.b.tsx": js`
-          export function headers({ loaderHeaders, parentHeaders }) {
-            let headers = new Headers(parentHeaders);
-            loaderHeaders.forEach((value, name) => headers.set(name, value));
-            headers.set('x-b-headers', 'true')
-            return headers;
+          export function action({ request, response }) {
+            let headers = new Headers();
+            headers.set('x-one', 'b action set');
+            headers.append('x-one', 'b action append');
+            headers.set('x-two', 'b action set');
+            headers.append('x-three', 'b action append');
+            headers.set('x-four', 'b action set');
+            return new Response(null, { headers });
           }
 
-          export function loader({ request }) {
-            return new Response(null, { headers: { "x-b-loader": "true" } });
+          export function loader({ request, response }) {
+            let headers = new Headers();
+            headers.set('x-one', 'b set');
+            headers.append('x-one', 'b append');
+            headers.set('x-two', 'b set');
+            headers.append('x-three', 'b append');
+            headers.delete('x-four');
+            return new Response(null, { headers });
+          }
+
+          export default function Comp() {
+            return null;
+          }
+        `,
+      },
+    });
+
+    // x-one uses both set and append
+    // x-two only uses set
+    // x-three only uses append
+    // x-four deletes
+    let res: Awaited<
+      ReturnType<
+        typeof fixture.requestDocument | typeof fixture.requestSingleFetchData
+      >
+    >;
+    res = await fixture.requestDocument("/a");
+    expect(res.headers.get("x-one")).toEqual("a set, a append");
+    expect(res.headers.get("x-two")).toEqual("a set");
+    expect(res.headers.get("x-three")).toEqual("a append");
+    expect(res.headers.get("x-four")).toEqual("a set");
+
+    res = await fixture.requestSingleFetchData("/a.data");
+    expect(res.headers.get("x-one")).toEqual("a set, a append");
+    expect(res.headers.get("x-two")).toEqual("a set");
+    expect(res.headers.get("x-three")).toEqual("a append");
+    expect(res.headers.get("x-four")).toEqual("a set");
+
+    res = await fixture.requestDocument("/a/b");
+    expect(res.headers.get("x-one")).toEqual("b set, b append");
+    expect(res.headers.get("x-two")).toEqual("b set");
+    expect(res.headers.get("x-three")).toEqual("b append"); // Blows away "a append"
+    expect(res.headers.get("x-four")).toEqual("a set");
+
+    res = await fixture.requestSingleFetchData("/a/b.data");
+    expect(res.headers.get("x-one")).toEqual("b set, b append");
+    expect(res.headers.get("x-two")).toEqual("b set");
+    expect(res.headers.get("x-three")).toEqual("b append"); // Blows away "a append"
+    expect(res.headers.get("x-four")).toEqual("a set");
+
+    // Action only - single fetch request
+    res = await fixture.requestSingleFetchData("/a/b.data", {
+      method: "post",
+      body: null,
+    });
+    expect(res.headers.get("x-one")).toEqual("b action set, b action append");
+    expect(res.headers.get("x-two")).toEqual("b action set");
+    expect(res.headers.get("x-three")).toEqual("b action append");
+    expect(res.headers.get("x-four")).toEqual("b action set");
+
+    // Actions and Loaders - Document request
+    res = await fixture.requestDocument("/a/b", {
+      method: "post",
+      body: null,
+    });
+    expect(res.headers.get("x-one")).toEqual("b set, b append");
+    expect(res.headers.get("x-two")).toEqual("b set");
+    expect(res.headers.get("x-three")).toEqual("b append"); // Blows away prior appends
+    expect(res.headers.get("x-four")).toEqual("a set"); // Can't delete via Response
+  });
+
+  test("merges status codes from nested routes when raw Responses are used", async () => {
+    let fixture = await createFixture({
+      config: {
+        future: {
+          unstable_singleFetch: true,
+        },
+      },
+      files: {
+        ...files,
+        "app/routes/a.tsx": js`
+          export function loader({ request, response }) {
+            if (new URL(request.url).searchParams.has("error")) {
+              return new Response(null, { status: 401 });
+            } else {
+              return new Response(null, { status: 201 });
+            }
+          }
+
+          export default function Comp() {
+            return null;
+          }
+        `,
+        "app/routes/a.b.tsx": js`
+          export function loader({ request, response }) {
+            return new Response(null, { status: 202 });
           }
 
           export default function Comp() {
@@ -518,15 +899,12 @@ test.describe("single-fetch", () => {
           }
         `,
         "app/routes/a.b.c.tsx": js`
-          export function headers({ loaderHeaders, parentHeaders }) {
-            let headers = new Headers(parentHeaders);
-            loaderHeaders.forEach((value, name) => headers.set(name, value));
-            headers.set('x-c-headers', 'true')
-            return headers;
+          export function action({ request, response }) {
+            return new Response(null, { status: 206 });
           }
 
-          export function loader({ request }) {
-            return new Response(null, { headers: { "x-c-loader": "true" } });
+          export function loader({ request, response }) {
+            return new Response(null, { status: 203 });
           }
 
           export default function Comp() {
@@ -536,56 +914,187 @@ test.describe("single-fetch", () => {
       },
     });
 
-    let res = await fixture.requestSingleFetchData("/a/b/c.data");
-    expect(res.headers.get("x-a-loader")).toEqual("true");
-    expect(res.headers.get("x-a-headers")).toEqual("true");
-    expect(res.headers.get("x-b-loader")).toEqual("true");
-    expect(res.headers.get("x-b-headers")).toEqual("true");
-    expect(res.headers.get("x-c-loader")).toEqual("true");
-    expect(res.headers.get("x-c-headers")).toEqual("true");
+    // Loaders
+    let res: Awaited<
+      ReturnType<
+        typeof fixture.requestDocument | typeof fixture.requestSingleFetchData
+      >
+    >;
+    res = await fixture.requestDocument("/a");
+    expect(res.status).toEqual(201);
 
-    res = await fixture.requestSingleFetchData(
-      "/a/b/c.data?_routes=routes%2Fa,routes%2Fa.b"
-    );
-    expect(res.headers.get("x-a-loader")).toEqual("true");
-    expect(res.headers.get("x-a-headers")).toEqual("true");
-    expect(res.headers.get("x-b-loader")).toEqual("true");
-    expect(res.headers.get("x-b-headers")).toEqual("true");
-    expect(res.headers.get("x-c-loader")).toBeNull();
-    expect(res.headers.get("x-c-headers")).toBeNull();
-
-    res = await fixture.requestSingleFetchData(
-      "/a/b/c.data?_routes=routes%2Fa"
-    );
-    expect(res.headers.get("x-a-loader")).toEqual("true");
-    expect(res.headers.get("x-a-headers")).toEqual("true");
-    expect(res.headers.get("x-b-loader")).toBeNull();
-    expect(res.headers.get("x-b-headers")).toBeNull();
-    expect(res.headers.get("x-c-loader")).toBeNull();
-    expect(res.headers.get("x-c-headers")).toBeNull();
-
-    res = await fixture.requestSingleFetchData(
-      "/a/b/c.data?_routes=routes%2Fa.b.c"
-    );
-    expect(res.headers.get("x-a-loader")).toBeNull();
-    expect(res.headers.get("x-a-headers")).toBeNull();
-    expect(res.headers.get("x-b-loader")).toBeNull();
-    expect(res.headers.get("x-b-headers")).toBeNull();
-    expect(res.headers.get("x-c-loader")).toEqual("true");
-    expect(res.headers.get("x-c-headers")).toEqual("true");
-
-    res = await fixture.requestSingleFetchData(
-      "/a/b/c.data?_routes=routes%2Fa,routes%2Fa.b.c"
-    );
-    expect(res.headers.get("x-a-loader")).toEqual("true");
-    expect(res.headers.get("x-a-loader")).toEqual("true");
-    expect(res.headers.get("x-b-headers")).toBeNull();
-    expect(res.headers.get("x-b-headers")).toBeNull();
-    expect(res.headers.get("x-c-loader")).toEqual("true");
-    expect(res.headers.get("x-c-headers")).toEqual("true");
+    res = await fixture.requestSingleFetchData("/a.data");
+    expect(res.status).toEqual(201);
+
+    res = await fixture.requestDocument("/a/b");
+    expect(res.status).toEqual(202);
+
+    res = await fixture.requestSingleFetchData("/a/b.data");
+    expect(res.status).toEqual(202);
+
+    res = await fixture.requestDocument("/a/b/c");
+    expect(res.status).toEqual(203);
+
+    res = await fixture.requestSingleFetchData("/a/b/c.data");
+    expect(res.status).toEqual(203);
+
+    // Errors
+    res = await fixture.requestDocument("/a?error");
+    expect(res.status).toEqual(401);
+
+    res = await fixture.requestSingleFetchData("/a.data?error");
+    expect(res.status).toEqual(401);
+
+    res = await fixture.requestDocument("/a/b?error");
+    expect(res.status).toEqual(401);
+
+    res = await fixture.requestSingleFetchData("/a/b.data?error");
+    expect(res.status).toEqual(401);
+
+    // Actions
+    res = await fixture.requestDocument("/a/b/c", {
+      method: "post",
+      body: null,
+    });
+    expect(res.status).toEqual(206);
+
+    res = await fixture.requestSingleFetchData("/a/b/c.data", {
+      method: "post",
+      body: null,
+    });
+    expect(res.status).toEqual(206);
+  });
+
+  test("processes thrown loader redirects via responseStub", async ({
+    page,
+  }) => {
+    let fixture = await createFixture({
+      config: {
+        future: {
+          unstable_singleFetch: true,
+        },
+      },
+      files: {
+        ...files,
+        "app/routes/data.tsx": js`
+          import { redirect } from '@remix-run/node';
+          export function loader({ request, response }) {
+            response.status = 302;
+            response.headers.set('Location', '/target');
+            throw response;
+          }
+          export default function Component() {
+            return null
+          }
+        `,
+        "app/routes/target.tsx": js`
+          export default function Component() {
+            return <h1 id="target">Target</h1>
+          }
+        `,
+      },
+    });
+
+    console.error = () => {};
+
+    let res = await fixture.requestDocument("/data");
+    expect(res.status).toBe(302);
+    expect(res.headers.get("Location")).toBe("/target");
+    expect(await res.text()).toBe("");
+
+    let appFixture = await createAppFixture(fixture);
+    let app = new PlaywrightFixture(appFixture, page);
+    await app.goto("/");
+    await app.clickLink("/data");
+    await page.waitForSelector("#target");
+    expect(await app.getHtml("#target")).toContain("Target");
   });
 
-  test("processes loader redirects", async ({ page }) => {
+  test("processes returned loader redirects via responseStub", async ({
+    page,
+  }) => {
+    let fixture = await createFixture({
+      config: {
+        future: {
+          unstable_singleFetch: true,
+        },
+      },
+      files: {
+        ...files,
+        "app/routes/data.tsx": js`
+          import { redirect } from '@remix-run/node';
+          export function loader({ request, response }) {
+            response.status = 302;
+            response.headers.set('Location', '/target');
+            return null
+          }
+          export default function Component() {
+            return null
+          }
+        `,
+        "app/routes/target.tsx": js`
+          export default function Component() {
+            return <h1 id="target">Target</h1>
+          }
+        `,
+      },
+    });
+
+    let res = await fixture.requestDocument("/data");
+    expect(res.status).toBe(302);
+    expect(res.headers.get("Location")).toBe("/target");
+    expect(await res.text()).toBe("");
+
+    let appFixture = await createAppFixture(fixture);
+    let app = new PlaywrightFixture(appFixture, page);
+    await app.goto("/");
+    await app.clickLink("/data");
+    await page.waitForSelector("#target");
+    expect(await app.getHtml("#target")).toContain("Target");
+  });
+
+  test("processes thrown loader redirects via Response", async ({ page }) => {
+    let fixture = await createFixture({
+      config: {
+        future: {
+          unstable_singleFetch: true,
+        },
+      },
+      files: {
+        ...files,
+        "app/routes/data.tsx": js`
+          import { redirect } from '@remix-run/node';
+          export function loader() {
+            throw redirect('/target');
+          }
+          export default function Component() {
+            return null
+          }
+        `,
+        "app/routes/target.tsx": js`
+          export default function Component() {
+            return <h1 id="target">Target</h1>
+          }
+        `,
+      },
+    });
+
+    console.error = () => {};
+
+    let res = await fixture.requestDocument("/data");
+    expect(res.status).toBe(302);
+    expect(res.headers.get("Location")).toBe("/target");
+    expect(await res.text()).toBe("");
+
+    let appFixture = await createAppFixture(fixture);
+    let app = new PlaywrightFixture(appFixture, page);
+    await app.goto("/");
+    await app.clickLink("/data");
+    await page.waitForSelector("#target");
+    expect(await app.getHtml("#target")).toContain("Target");
+  });
+
+  test("processes returned loader redirects via Response", async ({ page }) => {
     let fixture = await createFixture({
       config: {
         future: {
@@ -610,6 +1119,11 @@ test.describe("single-fetch", () => {
         `,
       },
     });
+    let res = await fixture.requestDocument("/data");
+    expect(res.status).toBe(302);
+    expect(res.headers.get("Location")).toBe("/target");
+    expect(await res.text()).toBe("");
+
     let appFixture = await createAppFixture(fixture);
     let app = new PlaywrightFixture(appFixture, page);
     await app.goto("/");
@@ -618,7 +1132,154 @@ test.describe("single-fetch", () => {
     expect(await app.getHtml("#target")).toContain("Target");
   });
 
-  test("processes action redirects", async ({ page }) => {
+  test("processes thrown action redirects via responseStub", async ({
+    page,
+  }) => {
+    let fixture = await createFixture(
+      {
+        config: {
+          future: {
+            unstable_singleFetch: true,
+          },
+        },
+        files: {
+          ...files,
+          "app/routes/data.tsx": js`
+            import { redirect } from '@remix-run/node';
+            export function action({ response }) {
+              response.status = 302;
+              response.headers.set('Location', '/target');
+              throw response;
+            }
+            export default function Component() {
+              return null
+            }
+          `,
+          "app/routes/target.tsx": js`
+            export default function Component() {
+              return <h1 id="target">Target</h1>
+            }
+          `,
+        },
+      },
+      ServerMode.Development
+    );
+
+    console.error = () => {};
+
+    let res = await fixture.requestDocument("/data", {
+      method: "post",
+      body: null,
+    });
+    expect(res.status).toBe(302);
+    expect(res.headers.get("Location")).toBe("/target");
+    expect(await res.text()).toBe("");
+
+    let appFixture = await createAppFixture(fixture, ServerMode.Development);
+    let app = new PlaywrightFixture(appFixture, page);
+    await app.goto("/");
+    await app.clickSubmitButton("/data");
+    await page.waitForSelector("#target");
+    expect(await app.getHtml("#target")).toContain("Target");
+  });
+
+  test("processes returned action redirects via responseStub", async ({
+    page,
+  }) => {
+    let fixture = await createFixture(
+      {
+        config: {
+          future: {
+            unstable_singleFetch: true,
+          },
+        },
+        files: {
+          ...files,
+          "app/routes/data.tsx": js`
+            import { redirect } from '@remix-run/node';
+            export function action({ response }) {
+              response.status = 302;
+              response.headers.set('Location', '/target');
+              return null
+            }
+            export default function Component() {
+              return null
+            }
+          `,
+          "app/routes/target.tsx": js`
+            export default function Component() {
+              return <h1 id="target">Target</h1>
+            }
+          `,
+        },
+      },
+      ServerMode.Development
+    );
+
+    let res = await fixture.requestDocument("/data", {
+      method: "post",
+      body: null,
+    });
+    expect(res.status).toBe(302);
+    expect(res.headers.get("Location")).toBe("/target");
+    expect(await res.text()).toBe("");
+
+    let appFixture = await createAppFixture(fixture, ServerMode.Development);
+    let app = new PlaywrightFixture(appFixture, page);
+    await app.goto("/");
+    await app.clickSubmitButton("/data");
+    await page.waitForSelector("#target");
+    expect(await app.getHtml("#target")).toContain("Target");
+  });
+
+  test("processes thrown action redirects via Response", async ({ page }) => {
+    let fixture = await createFixture(
+      {
+        config: {
+          future: {
+            unstable_singleFetch: true,
+          },
+        },
+        files: {
+          ...files,
+          "app/routes/data.tsx": js`
+            import { redirect } from '@remix-run/node';
+            export function action() {
+              throw redirect('/target');
+            }
+            export default function Component() {
+              return null
+            }
+          `,
+          "app/routes/target.tsx": js`
+            export default function Component() {
+              return <h1 id="target">Target</h1>
+            }
+          `,
+        },
+      },
+      ServerMode.Development
+    );
+
+    console.error = () => {};
+
+    let res = await fixture.requestDocument("/data", {
+      method: "post",
+      body: null,
+    });
+    expect(res.status).toBe(302);
+    expect(res.headers.get("Location")).toBe("/target");
+    expect(await res.text()).toBe("");
+
+    let appFixture = await createAppFixture(fixture, ServerMode.Development);
+    let app = new PlaywrightFixture(appFixture, page);
+    await app.goto("/");
+    await app.clickSubmitButton("/data");
+    await page.waitForSelector("#target");
+    expect(await app.getHtml("#target")).toContain("Target");
+  });
+
+  test("processes returned action redirects via Response", async ({ page }) => {
     let fixture = await createFixture(
       {
         config: {
@@ -646,6 +1307,15 @@ test.describe("single-fetch", () => {
       },
       ServerMode.Development
     );
+
+    let res = await fixture.requestDocument("/data", {
+      method: "post",
+      body: null,
+    });
+    expect(res.status).toBe(302);
+    expect(res.headers.get("Location")).toBe("/target");
+    expect(await res.text()).toBe("");
+
     let appFixture = await createAppFixture(fixture, ServerMode.Development);
     let app = new PlaywrightFixture(appFixture, page);
     await app.goto("/");
diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json
index d6c59042c93..1789ff2b438 100644
--- a/packages/remix-dev/package.json
+++ b/packages/remix-dev/package.json
@@ -32,7 +32,7 @@
     "@mdx-js/mdx": "^2.3.0",
     "@npmcli/package-json": "^4.0.1",
     "@remix-run/node": "workspace:*",
-    "@remix-run/router": "0.0.0-experimental-c7dd3d3a",
+    "@remix-run/router": "0.0.0-experimental-0f302655",
     "@remix-run/server-runtime": "workspace:*",
     "@types/mdx": "^2.0.5",
     "@vanilla-extract/integration": "^6.2.0",
diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json
index be37161acaa..79eb341f290 100644
--- a/packages/remix-react/package.json
+++ b/packages/remix-react/package.json
@@ -19,10 +19,10 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@remix-run/router": "0.0.0-experimental-c7dd3d3a",
+    "@remix-run/router": "0.0.0-experimental-0f302655",
     "@remix-run/server-runtime": "workspace:*",
-    "react-router": "0.0.0-experimental-c7dd3d3a",
-    "react-router-dom": "0.0.0-experimental-c7dd3d3a",
+    "react-router": "0.0.0-experimental-0f302655",
+    "react-router-dom": "0.0.0-experimental-0f302655",
     "turbo-stream": "^2.0.0"
   },
   "devDependencies": {
diff --git a/packages/remix-react/single-fetch.tsx b/packages/remix-react/single-fetch.tsx
index 2df962276c5..5824af92ba7 100644
--- a/packages/remix-react/single-fetch.tsx
+++ b/packages/remix-react/single-fetch.tsx
@@ -126,9 +126,9 @@ function singleFetchActionStrategy(
   matches: DataStrategyFunctionArgs["matches"]
 ) {
   return Promise.all(
-    matches.map(async (m) =>
-      m.resolve(async (handler): Promise<HandlerResult> => {
-        let actionStatus: number | undefined;
+    matches.map(async (m) => {
+      let actionStatus: number | undefined;
+      let result = await m.resolve(async (handler): Promise<HandlerResult> => {
         let result = await handler(async () => {
           let url = singleFetchUrl(request.url);
           let init = await createRequestInit(request);
@@ -141,8 +141,13 @@ function singleFetchActionStrategy(
           result,
           status: actionStatus,
         };
-      })
-    )
+      });
+      return {
+        ...result,
+        // Proxy along the action HTTP response status for thrown errors
+        status: actionStatus,
+      };
+    })
   );
 }
 
diff --git a/packages/remix-server-runtime/data.ts b/packages/remix-server-runtime/data.ts
index 47c2e6dbd54..59d70500d34 100644
--- a/packages/remix-server-runtime/data.ts
+++ b/packages/remix-server-runtime/data.ts
@@ -10,6 +10,7 @@ import type {
   ActionFunctionArgs,
   LoaderFunction,
   LoaderFunctionArgs,
+  ResponseStub,
 } from "./routeModules";
 
 /**
@@ -27,13 +28,14 @@ export interface AppLoadContext {
  */
 export type AppData = unknown;
 
-export async function callRouteActionRR({
+export async function callRouteAction({
   loadContext,
   action,
   params,
   request,
   routeId,
   singleFetch,
+  response,
 }: {
   request: Request;
   action: ActionFunction;
@@ -41,11 +43,13 @@ export async function callRouteActionRR({
   loadContext: AppLoadContext;
   routeId: string;
   singleFetch: boolean;
+  response?: ResponseStub;
 }) {
   let result = await action({
     request: stripDataParam(stripIndexParam(request)),
     context: loadContext,
     params,
+    response,
   });
 
   if (result === undefined) {
@@ -63,13 +67,14 @@ export async function callRouteActionRR({
   return isResponse(result) ? result : json(result);
 }
 
-export async function callRouteLoaderRR({
+export async function callRouteLoader({
   loadContext,
   loader,
   params,
   request,
   routeId,
   singleFetch,
+  response,
 }: {
   request: Request;
   loader: LoaderFunction;
@@ -77,11 +82,13 @@ export async function callRouteLoaderRR({
   loadContext: AppLoadContext;
   routeId: string;
   singleFetch: boolean;
+  response?: ResponseStub;
 }) {
   let result = await loader({
     request: stripDataParam(stripIndexParam(request)),
     context: loadContext,
     params,
+    response,
   });
 
   if (result === undefined) {
diff --git a/packages/remix-server-runtime/headers.ts b/packages/remix-server-runtime/headers.ts
index 698b6af1542..c17e1cea7d4 100644
--- a/packages/remix-server-runtime/headers.ts
+++ b/packages/remix-server-runtime/headers.ts
@@ -5,8 +5,7 @@ import type { ServerBuild } from "./build";
 
 export function getDocumentHeaders(
   build: ServerBuild,
-  context: StaticHandlerContext,
-  loadRouteIds?: string[]
+  context: StaticHandlerContext
 ): Headers {
   let boundaryIdx = context.errors
     ? context.matches.findIndex((m) => context.errors![m.route.id])
@@ -16,10 +15,6 @@ export function getDocumentHeaders(
       ? context.matches.slice(0, boundaryIdx + 1)
       : context.matches;
 
-  if (loadRouteIds) {
-    matches = matches.filter((m) => loadRouteIds.includes(m.route.id));
-  }
-
   let errorHeaders: Headers | undefined;
 
   if (boundaryIdx >= 0) {
diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json
index e47dbe1dbcf..1d0548a4467 100644
--- a/packages/remix-server-runtime/package.json
+++ b/packages/remix-server-runtime/package.json
@@ -19,7 +19,7 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@remix-run/router": "0.0.0-experimental-c7dd3d3a",
+    "@remix-run/router": "0.0.0-experimental-0f302655",
     "@types/cookie": "^0.6.0",
     "@web3-storage/multipart-parser": "^1.0.0",
     "cookie": "^0.6.0",
diff --git a/packages/remix-server-runtime/routeModules.ts b/packages/remix-server-runtime/routeModules.ts
index 58e0ce2f7d0..74832b6b384 100644
--- a/packages/remix-server-runtime/routeModules.ts
+++ b/packages/remix-server-runtime/routeModules.ts
@@ -27,6 +27,22 @@ export type DataFunctionArgs = RRActionFunctionArgs<AppLoadContext> &
     context: AppLoadContext;
   };
 
+export const ResponseStubOperationsSymbol = Symbol("ResponseStubOperations");
+export type ResponseStubOperation = [
+  "set" | "append" | "delete",
+  string,
+  string?
+];
+/**
+ * A stubbed response to let you set the status/headers of your response from
+ * loader/action functions
+ */
+export type ResponseStub = {
+  status: number | undefined;
+  headers: Headers;
+  [ResponseStubOperationsSymbol]: ResponseStubOperation[];
+};
+
 /**
  * A function that handles data mutations for a route on the server
  */
@@ -40,6 +56,8 @@ export type ActionFunction = (
 export type ActionFunctionArgs = RRActionFunctionArgs<AppLoadContext> & {
   // Context is always provided in Remix, and typed for module augmentation support.
   context: AppLoadContext;
+  // TODO: (v7) Make this non-optional once single-fetch is the default
+  response?: ResponseStub;
 };
 
 /**
@@ -71,6 +89,8 @@ export type LoaderFunction = (
 export type LoaderFunctionArgs = RRLoaderFunctionArgs<AppLoadContext> & {
   // Context is always provided in Remix, and typed for module augmentation support.
   context: AppLoadContext;
+  // TODO: (v7) Make this non-optional once single-fetch is the default
+  response?: ResponseStub;
 };
 
 /**
diff --git a/packages/remix-server-runtime/routes.ts b/packages/remix-server-runtime/routes.ts
index a96b6dbd71c..5aade6661d5 100644
--- a/packages/remix-server-runtime/routes.ts
+++ b/packages/remix-server-runtime/routes.ts
@@ -4,9 +4,9 @@ import type {
   ActionFunctionArgs as RRActionFunctionArgs,
 } from "@remix-run/router";
 
-import { callRouteActionRR, callRouteLoaderRR } from "./data";
+import { callRouteAction, callRouteLoader } from "./data";
 import type { FutureConfig } from "./entry";
-import type { ServerRouteModule } from "./routeModules";
+import type { ResponseStub, ServerRouteModule } from "./routeModules";
 
 export interface RouteManifest<Route> {
   [routeId: string]: Route;
@@ -92,25 +92,31 @@ export function createStaticHandlerDataRoutes(
       loader: route.module.loader
         ? // Need to use RR's version here to permit the optional context even
           // though we know it'll always be provided in remix
-          (args: RRLoaderFunctionArgs) =>
-            callRouteLoaderRR({
+          (args: RRLoaderFunctionArgs, dataStrategyCtx?: unknown) =>
+            callRouteLoader({
               request: args.request,
               params: args.params,
               loadContext: args.context,
               loader: route.module.loader!,
               routeId: route.id,
               singleFetch: future.unstable_singleFetch === true,
+              response: (
+                dataStrategyCtx as unknown as { response: ResponseStub }
+              )?.response,
             })
         : undefined,
       action: route.module.action
-        ? (args: RRActionFunctionArgs) =>
-            callRouteActionRR({
+        ? (args: RRActionFunctionArgs, dataStrategyCtx?: unknown) =>
+            callRouteAction({
               request: args.request,
               params: args.params,
               loadContext: args.context,
               action: route.module.action!,
               routeId: route.id,
               singleFetch: future.unstable_singleFetch === true,
+              response: (
+                dataStrategyCtx as unknown as { response: ResponseStub }
+              )?.response,
             })
         : undefined,
       handle: route.module.handle,
diff --git a/packages/remix-server-runtime/server.ts b/packages/remix-server-runtime/server.ts
index 65da52b4e39..f7e30332914 100644
--- a/packages/remix-server-runtime/server.ts
+++ b/packages/remix-server-runtime/server.ts
@@ -2,6 +2,8 @@ import type {
   UNSAFE_DeferredData as DeferredData,
   ErrorResponse,
   StaticHandler,
+  unstable_DataStrategyFunctionArgs as DataStrategyFunctionArgs,
+  StaticHandlerContext,
 } from "@remix-run/router";
 import {
   UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL,
@@ -27,13 +29,16 @@ import {
 import { getDocumentHeaders } from "./headers";
 import invariant from "./invariant";
 import { ServerMode, isServerMode } from "./mode";
-import type { RouteMatch } from "./routeMatching";
 import { matchServerRoutes } from "./routeMatching";
+import type { ResponseStub, ResponseStubOperation } from "./routeModules";
+import { ResponseStubOperationsSymbol } from "./routeModules";
 import type { ServerRoute } from "./routes";
 import { createStaticHandlerDataRoutes, createRoutes } from "./routes";
 import {
   createDeferredReadableStream,
+  isDeferredData,
   isRedirectResponse,
+  isRedirectStatusCode,
   isResponse,
 } from "./responses";
 import { createServerHandoffString } from "./serverHandoff";
@@ -81,6 +86,7 @@ function derive(build: ServerBuild, mode?: string) {
 }
 
 export const SingleFetchRedirectSymbol = Symbol("SingleFetchRedirect");
+export const ResponseStubActionSymbol = Symbol("ResponseStubAction");
 
 export const createRequestHandler: CreateRequestHandlerFunction = (
   build,
@@ -167,7 +173,7 @@ export const createRequestHandler: CreateRequestHandlerFunction = (
         .replace(/\.data$/, "")
         .replace(/^\/_root$/, "/");
 
-      let matches = matchServerRoutes(
+      let singleFetchMatches = matchServerRoutes(
         routes,
         handlerUrl.pathname,
         _build.basename
@@ -177,7 +183,6 @@ export const createRequestHandler: CreateRequestHandlerFunction = (
         serverMode,
         _build,
         staticHandler,
-        matches,
         request,
         handlerUrl,
         loadContext,
@@ -187,13 +192,13 @@ export const createRequestHandler: CreateRequestHandlerFunction = (
       if (_build.entry.module.handleDataRequest) {
         response = await _build.entry.module.handleDataRequest(response, {
           context: loadContext,
-          params,
+          params: singleFetchMatches ? singleFetchMatches[0].params : {},
           request,
         });
 
         if (isRedirectResponse(response)) {
           let result: SingleFetchResult | SingleFetchResults =
-            getSingleFetchRedirect(response);
+            getSingleFetchRedirect(response.status, response.headers);
 
           if (request.method === "GET") {
             result = {
@@ -344,7 +349,6 @@ async function handleSingleFetchRequest(
   serverMode: ServerMode,
   build: ServerBuild,
   staticHandler: StaticHandler,
-  matches: RouteMatch<ServerRoute>[] | null,
   request: Request,
   handlerUrl: URL,
   loadContext: AppLoadContext,
@@ -353,20 +357,20 @@ async function handleSingleFetchRequest(
   let { result, headers, status } =
     request.method !== "GET"
       ? await singleFetchAction(
+          serverMode,
+          staticHandler,
           request,
           handlerUrl,
-          staticHandler,
           loadContext,
           handleError
         )
       : await singleFetchLoaders(
+          serverMode,
+          staticHandler,
           request,
           handlerUrl,
-          staticHandler,
           loadContext,
-          handleError,
-          serverMode,
-          build
+          handleError
         );
 
   // Mark all successful responses with a header so we can identify in-flight
@@ -392,9 +396,10 @@ async function handleSingleFetchRequest(
 }
 
 async function singleFetchAction(
+  serverMode: ServerMode,
+  staticHandler: StaticHandler,
   request: Request,
   handlerUrl: URL,
-  staticHandler: StaticHandler,
   loadContext: AppLoadContext,
   handleError: (err: unknown) => void
 ): Promise<{ result: SingleFetchResult; headers: Headers; status: number }> {
@@ -406,60 +411,79 @@ async function singleFetchAction(
       signal: request.signal,
       ...(request.body ? { duplex: "half" } : undefined),
     });
-    let result = await staticHandler.queryRoute(handlerRequest, {
+
+    let responseStubs = getResponseStubs();
+    let result = await staticHandler.query(handlerRequest, {
       requestContext: loadContext,
+      skipLoaderErrorBubbling: true,
+      skipLoaders: true,
+      unstable_dataStrategy: getSingleFetchDataStrategy(responseStubs),
     });
 
     // Unlike `handleDataRequest`, when singleFetch is enabled, queryRoute does
     // let non-Response return values through
-    if (!isResponse(result)) {
-      return { result: { data: result }, headers: new Headers(), status: 200 };
-    }
-
-    if (isRedirectResponse(result)) {
+    if (isResponse(result)) {
       return {
-        result: getSingleFetchRedirect(result),
+        result: getSingleFetchRedirect(result.status, result.headers),
         headers: result.headers,
-        status: 200, // Don't trigger a redirect on the `fetch`
+        status: 200,
       };
     }
-    return {
-      result: { data: await unwrapResponse(result) },
-      headers: result.headers,
-      status: result.status,
-    };
-  } catch (error) {
-    if (isResponse(error)) {
+
+    let context = result;
+
+    let singleFetchResult: SingleFetchResult;
+    let { statusCode, headers } = mergeResponseStubs(context, responseStubs);
+
+    if (isRedirectStatusCode(statusCode) && headers.has("Location")) {
       return {
-        result: {
-          error: new ErrorResponseImpl(
-            error.status,
-            error.statusText,
-            await unwrapResponse(error)
-          ),
-        },
-        headers: error.headers,
-        status: error.status,
+        result: getSingleFetchRedirect(statusCode, headers),
+        headers,
+        status: 200, // Don't want the `fetch` call to follow the redirect
       };
+    }
+
+    // Sanitize errors outside of development environments
+    if (context.errors) {
+      Object.values(context.errors).forEach((err) => {
+        // @ts-expect-error This is "private" from users but intended for internal use
+        if (!isRouteErrorResponse(err) || err.error) {
+          handleError(err);
+        }
+      });
+      context.errors = sanitizeErrors(context.errors, serverMode);
+    }
+
+    if (context.errors) {
+      let error = Object.values(context.errors)[0];
+      singleFetchResult = { error: isResponseStub(error) ? null : error };
     } else {
-      handleError(error);
-      return {
-        result: { error },
-        headers: new Headers(),
-        status: isRouteErrorResponse(error) ? error.status : 500,
-      };
+      singleFetchResult = { data: Object.values(context.actionData || {})[0] };
     }
+
+    return {
+      result: singleFetchResult,
+      headers,
+      status: statusCode,
+    };
+  } catch (error) {
+    handleError(error);
+    // These should only be internal remix errors, no need to deal with responseStubs
+    return {
+      result: { error },
+      headers: new Headers(),
+      status: 500,
+    };
   }
 }
 
 async function singleFetchLoaders(
+  serverMode: ServerMode,
+  staticHandler: StaticHandler,
   request: Request,
   handlerUrl: URL,
-  staticHandler: StaticHandler,
   loadContext: AppLoadContext,
-  handleError: (err: unknown) => void,
-  serverMode: ServerMode,
-  build: ServerBuild
+  handleError: (err: unknown) => void
 ): Promise<{ result: SingleFetchResults; headers: Headers; status: number }> {
   try {
     let handlerRequest = new Request(handlerUrl, {
@@ -469,15 +493,21 @@ async function singleFetchLoaders(
     let loadRouteIds =
       new URL(request.url).searchParams.get("_routes")?.split(",") || undefined;
 
+    let responseStubs = getResponseStubs();
     let result = await staticHandler.query(handlerRequest, {
       requestContext: loadContext,
       loadRouteIds,
       skipLoaderErrorBubbling: true,
+      unstable_dataStrategy: getSingleFetchDataStrategy(responseStubs),
     });
+
     if (isResponse(result)) {
       return {
         result: {
-          [SingleFetchRedirectSymbol]: getSingleFetchRedirect(result),
+          [SingleFetchRedirectSymbol]: getSingleFetchRedirect(
+            result.status,
+            result.headers
+          ),
         },
         headers: result.headers,
         status: 200, // Don't want the `fetch` call to follow the redirect
@@ -486,6 +516,21 @@ async function singleFetchLoaders(
 
     let context = result;
 
+    let { statusCode, headers } = mergeResponseStubs(context, responseStubs);
+
+    if (isRedirectStatusCode(statusCode) && headers.has("Location")) {
+      return {
+        result: {
+          [SingleFetchRedirectSymbol]: getSingleFetchRedirect(
+            statusCode,
+            headers
+          ),
+        },
+        headers,
+        status: 200, // Don't want the `fetch` call to follow the redirect
+      };
+    }
+
     // Sanitize errors outside of development environments
     if (context.errors) {
       Object.values(context.errors).forEach((err) => {
@@ -505,11 +550,16 @@ async function singleFetchLoaders(
           (m) => m.route.loader && loadRouteIds!.includes(m.route.id)
         )
       : context.matches;
+
     loadedMatches.forEach((m) => {
       let data = context.loaderData?.[m.route.id];
       let error = context.errors?.[m.route.id];
       if (error !== undefined) {
-        results[m.route.id] = { error };
+        if (isResponseStub(error)) {
+          results[m.route.id] = { error: null };
+        } else {
+          results[m.route.id] = { error };
+        }
       } else if (data !== undefined) {
         results[m.route.id] = { data };
       }
@@ -517,11 +567,12 @@ async function singleFetchLoaders(
 
     return {
       result: results,
-      headers: getDocumentHeaders(build, context, loadRouteIds),
-      status: context.statusCode,
+      headers,
+      status: statusCode,
     };
   } catch (error: unknown) {
     handleError(error);
+    // These should only be internal remix errors, no need to deal with responseStubs
     return {
       result: { root: { error } },
       headers: new Headers(),
@@ -540,9 +591,13 @@ async function handleDocumentRequest(
   criticalCss?: string
 ) {
   let context;
+  let responseStubs = getResponseStubs();
   try {
     context = await staticHandler.query(request, {
       requestContext: loadContext,
+      unstable_dataStrategy: build.future.unstable_singleFetch
+        ? getSingleFetchDataStrategy(responseStubs)
+        : undefined,
     });
   } catch (error: unknown) {
     handleError(error);
@@ -564,7 +619,23 @@ async function handleDocumentRequest(
     context.errors = sanitizeErrors(context.errors, serverMode);
   }
 
-  let headers = getDocumentHeaders(build, context);
+  let statusCode: number;
+  let headers: Headers;
+  if (build.future.unstable_singleFetch) {
+    let merged = mergeResponseStubs(context, responseStubs);
+    statusCode = merged.statusCode;
+    headers = merged.headers;
+
+    if (isRedirectStatusCode(statusCode) && headers.has("Location")) {
+      return new Response(null, {
+        status: statusCode,
+        headers,
+      });
+    }
+  } else {
+    statusCode = context.statusCode;
+    headers = getDocumentHeaders(build, context);
+  }
 
   // Server UI state to send to the client.
   // - When single fetch is enabled, this is streamed down via `serverHandoffStream`
@@ -607,7 +678,7 @@ async function handleDocumentRequest(
   try {
     return await handleDocumentRequestFunction(
       request,
-      context.statusCode,
+      statusCode,
       headers,
       entryContext,
       loadContext
@@ -788,10 +859,163 @@ function unwrapResponse(response: Response) {
     : response.text();
 }
 
-function getSingleFetchRedirect(response: Response): SingleFetchRedirectResult {
+function getResponseStub(status?: number) {
+  let headers = new Headers();
+  let operations: ResponseStubOperation[] = [];
+  let headersProxy = new Proxy(headers, {
+    get(target, prop, receiver) {
+      if (prop === "set" || prop === "append" || prop === "delete") {
+        return (name: string, value: string) => {
+          operations.push([prop, name, value]);
+          Reflect.apply(target[prop], target, [name, value]);
+        };
+      }
+      return Reflect.get(target, prop, receiver);
+    },
+  });
+  return {
+    status,
+    headers: headersProxy,
+    [ResponseStubOperationsSymbol]: operations,
+  };
+}
+
+function getSingleFetchDataStrategy(
+  responseStubs: ReturnType<typeof getResponseStubs>
+) {
+  return async ({ request, matches }: DataStrategyFunctionArgs) => {
+    let results = await Promise.all(
+      matches.map(async (match) => {
+        let responseStub: ResponseStub | undefined;
+        if (request.method !== "GET") {
+          responseStub = responseStubs[ResponseStubActionSymbol];
+        } else {
+          responseStub = responseStubs[match.route.id];
+        }
+
+        let result = await match.resolve(async (handler) => {
+          let data = await handler({ response: responseStub });
+          return { type: "data", result: data };
+        });
+
+        // Transfer raw Response status/headers to responseStubs
+        if (isResponse(result.result)) {
+          proxyResponseToResponseStub(
+            result.result.status,
+            result.result.headers,
+            responseStub
+          );
+        } else if (isDeferredData(result.result) && result.result.init) {
+          proxyResponseToResponseStub(
+            result.result.init.status,
+            new Headers(result.result.init.headers),
+            responseStub
+          );
+        }
+
+        return result;
+      })
+    );
+    return results;
+  };
+}
+
+function proxyResponseToResponseStub(
+  status: number | undefined,
+  headers: Headers,
+  responseStub: ResponseStub
+) {
+  if (status != null && responseStub.status == null) {
+    responseStub.status = status;
+  }
+  for (let [k, v] of headers) {
+    if (k.toLowerCase() !== "set-cookie") {
+      responseStub.headers.set(k, v);
+    }
+  }
+
+  // Unsure why this is complaining?  It's fine in VSCode but fails with tsc...
+  // @ts-ignore - ignoring instead of expecting because otherwise build fails locally
+  for (let v of headers.getSetCookie()) {
+    responseStub.headers.append("Set-Cookie", v);
+  }
+}
+
+function isResponseStub(value: any): value is ResponseStub {
+  return (
+    value && typeof value === "object" && ResponseStubOperationsSymbol in value
+  );
+}
+
+function getResponseStubs() {
+  return new Proxy({} as Record<string | symbol, ResponseStub>, {
+    get(responseStubCache, prop) {
+      let cached = responseStubCache[prop];
+      if (!cached) {
+        responseStubCache[prop] = cached = getResponseStub();
+      }
+      return cached;
+    },
+  });
+}
+
+function mergeResponseStubs(
+  context: StaticHandlerContext,
+  responseStubs: ReturnType<typeof getResponseStubs>
+) {
+  let statusCode: number | undefined = undefined;
+  let headers = new Headers();
+
+  // Action followed by top-down loaders
+  let actionStub = responseStubs[ResponseStubActionSymbol];
+  let stubs = [
+    actionStub,
+    ...context.matches.map((m) => responseStubs[m.route.id]),
+  ];
+
+  for (let stub of stubs) {
+    // Take the highest error/redirect, or the lowest success value - preferring
+    // action 200's over loader 200s
+    if (
+      // first status found on the way down
+      (statusCode === undefined && stub.status) ||
+      // deeper 2xx status found while not overriding the action status
+      (statusCode !== undefined &&
+        statusCode < 300 &&
+        stub.status &&
+        statusCode !== actionStub?.status)
+    ) {
+      statusCode = stub.status;
+    }
+
+    // Replay headers operations in order
+    let ops = stub[ResponseStubOperationsSymbol];
+    for (let [op, ...args] of ops) {
+      // @ts-expect-error
+      headers[op](...args);
+    }
+  }
+
+  // If no response stubs set it, use whatever we got back from the router
+  // context which handles internal ErrorResponse cases like 404/405's where
+  // we may never run a loader/action
+  if (statusCode === undefined) {
+    statusCode = context.statusCode;
+  }
+  if (statusCode === undefined) {
+    statusCode = 200;
+  }
+
+  return { statusCode, headers };
+}
+
+function getSingleFetchRedirect(
+  status: number,
+  headers: Headers
+): SingleFetchRedirectResult {
   return {
-    redirect: response.headers.get("Location")!,
-    status: response.status,
+    redirect: headers.get("Location")!,
+    status,
     revalidate:
       // Technically X-Remix-Revalidate isn't needed here - that was an implementation
       // detail of ?_data requests as our way to tell the front end to revalidate when
@@ -800,9 +1024,8 @@ function getSingleFetchRedirect(response: Response): SingleFetchRedirectResult {
       // However, we're respecting it for now because it may be something folks have
       // used in their own responses
       // TODO(v3): Consider removing or making this official public API
-      response.headers.has("X-Remix-Revalidate") ||
-      response.headers.has("Set-Cookie"),
-    reload: response.headers.has("X-Remix-Reload-Document"),
+      headers.has("X-Remix-Revalidate") || headers.has("Set-Cookie"),
+    reload: headers.has("X-Remix-Reload-Document"),
   };
 }
 
diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
index 9079854fe9d..81636d20bc2 100644
--- a/packages/remix-testing/package.json
+++ b/packages/remix-testing/package.json
@@ -21,8 +21,8 @@
   "dependencies": {
     "@remix-run/node": "workspace:*",
     "@remix-run/react": "workspace:*",
-    "@remix-run/router": "0.0.0-experimental-c7dd3d3a",
-    "react-router-dom": "0.0.0-experimental-c7dd3d3a"
+    "@remix-run/router": "0.0.0-experimental-0f302655",
+    "react-router-dom": "0.0.0-experimental-0f302655"
   },
   "devDependencies": {
     "@remix-run/server-runtime": "workspace:*",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 86f20902365..a56de7cf336 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -320,8 +320,8 @@ importers:
         specifier: workspace:*
         version: link:../packages/remix-node
       '@remix-run/router':
-        specifier: 0.0.0-experimental-c7dd3d3a
-        version: 0.0.0-experimental-c7dd3d3a
+        specifier: 0.0.0-experimental-0f302655
+        version: 0.0.0-experimental-0f302655
       '@remix-run/server-runtime':
         specifier: workspace:*
         version: link:../packages/remix-server-runtime
@@ -868,8 +868,8 @@ importers:
         specifier: ^2.8.1
         version: link:../remix-react
       '@remix-run/router':
-        specifier: 0.0.0-experimental-c7dd3d3a
-        version: 0.0.0-experimental-c7dd3d3a
+        specifier: 0.0.0-experimental-0f302655
+        version: 0.0.0-experimental-0f302655
       '@remix-run/server-runtime':
         specifier: workspace:*
         version: link:../remix-server-runtime
@@ -1211,17 +1211,17 @@ importers:
   packages/remix-react:
     dependencies:
       '@remix-run/router':
-        specifier: 0.0.0-experimental-c7dd3d3a
-        version: 0.0.0-experimental-c7dd3d3a
+        specifier: 0.0.0-experimental-0f302655
+        version: 0.0.0-experimental-0f302655
       '@remix-run/server-runtime':
         specifier: workspace:*
         version: link:../remix-server-runtime
       react-router:
-        specifier: 0.0.0-experimental-c7dd3d3a
-        version: 0.0.0-experimental-c7dd3d3a(react@18.2.0)
+        specifier: 0.0.0-experimental-0f302655
+        version: 0.0.0-experimental-0f302655(react@18.2.0)
       react-router-dom:
-        specifier: 0.0.0-experimental-c7dd3d3a
-        version: 0.0.0-experimental-c7dd3d3a(react-dom@18.2.0)(react@18.2.0)
+        specifier: 0.0.0-experimental-0f302655
+        version: 0.0.0-experimental-0f302655(react-dom@18.2.0)(react@18.2.0)
       turbo-stream:
         specifier: ^2.0.0
         version: 2.0.0
@@ -1297,8 +1297,8 @@ importers:
   packages/remix-server-runtime:
     dependencies:
       '@remix-run/router':
-        specifier: 0.0.0-experimental-c7dd3d3a
-        version: 0.0.0-experimental-c7dd3d3a
+        specifier: 0.0.0-experimental-0f302655
+        version: 0.0.0-experimental-0f302655
       '@types/cookie':
         specifier: ^0.6.0
         version: 0.6.0
@@ -1334,11 +1334,11 @@ importers:
         specifier: workspace:*
         version: link:../remix-react
       '@remix-run/router':
-        specifier: 0.0.0-experimental-c7dd3d3a
-        version: 0.0.0-experimental-c7dd3d3a
+        specifier: 0.0.0-experimental-0f302655
+        version: 0.0.0-experimental-0f302655
       react-router-dom:
-        specifier: 0.0.0-experimental-c7dd3d3a
-        version: 0.0.0-experimental-c7dd3d3a(react-dom@18.2.0)(react@18.2.0)
+        specifier: 0.0.0-experimental-0f302655
+        version: 0.0.0-experimental-0f302655(react-dom@18.2.0)(react@18.2.0)
     devDependencies:
       '@remix-run/server-runtime':
         specifier: workspace:*
@@ -4193,8 +4193,8 @@ packages:
       - encoding
     dev: false
 
-  /@remix-run/router@0.0.0-experimental-c7dd3d3a:
-    resolution: {integrity: sha512-reXnySaRGlEl6cOgF7fSQvIRzyRFUjGsez0kHQk0ok6Z3Y7n1PVTCKNhooSfOI1hBOi0c9cIMurhoTgjYXyxHw==}
+  /@remix-run/router@0.0.0-experimental-0f302655:
+    resolution: {integrity: sha512-/Lb7eqBbMON5ue+lxTflS8lZ2WwXxk/iA+YRbsmuu3gn/pb8eto5JfyV3H/NPjlL+oxxXxcYGvzWor55OXIlSQ==}
     engines: {node: '>=14.0.0'}
     dev: false
 
@@ -12784,26 +12784,26 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: false
 
-  /react-router-dom@0.0.0-experimental-c7dd3d3a(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-pp1l8sk4Rc9vLucHgHU4B2LUL/4e6iwD7ipDGgfc9a08eNVowxaDJXkbtyYE10lpjaZZkXF1DFkdHfGrKeXWQw==}
+  /react-router-dom@0.0.0-experimental-0f302655(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-UmaABR8mrGMrcH/EHt2bQYFFX2faICJEXg+Q+jUSXQhiN8lsqDGOF7chHYzU17Ud7NtsxdoeFeVIXIpXwjE4xQ==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
       react: '>=16.8'
       react-dom: '>=16.8'
     dependencies:
-      '@remix-run/router': 0.0.0-experimental-c7dd3d3a
+      '@remix-run/router': 0.0.0-experimental-0f302655
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      react-router: 0.0.0-experimental-c7dd3d3a(react@18.2.0)
+      react-router: 0.0.0-experimental-0f302655(react@18.2.0)
     dev: false
 
-  /react-router@0.0.0-experimental-c7dd3d3a(react@18.2.0):
-    resolution: {integrity: sha512-biSo7Pmedzrm9DXjC3ScIwCWVt3qVAutf51hJ/POxfcRYvhgi9ENNGHLjpqabBH4oI5IwI53Vh0w7pKOdadC9A==}
+  /react-router@0.0.0-experimental-0f302655(react@18.2.0):
+    resolution: {integrity: sha512-0A1d352GLuI23uIuPJgRDTqEz90KLG7ZmZ/mZPhv+bw8pymeAAVL8WAHIjjBFePvsjUVS30iV19DPvbgDUU+PA==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
       react: '>=16.8'
     dependencies:
-      '@remix-run/router': 0.0.0-experimental-c7dd3d3a
+      '@remix-run/router': 0.0.0-experimental-0f302655
       react: 18.2.0
     dev: false
 
diff --git a/scripts/bump-router-versions.sh b/scripts/bump-router-versions.sh
index 9fe24fe3223..1cfe1609942 100755
--- a/scripts/bump-router-versions.sh
+++ b/scripts/bump-router-versions.sh
@@ -41,7 +41,7 @@ cd ../..
 
 cd integration
 pnpm add -E @remix-run/router@${ROUTER_VERSION}
-cd ../..
+cd ..
 
 # Because deplicates...
 pnpm dedupe && rm -rf ./node_modules && pnpm install

From 4db797680c377ad37ec650e890c71ad89cec8382 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Wed, 27 Mar 2024 11:30:52 -0400
Subject: [PATCH 036/108] Docs for single fetch (#9093)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sergio Xalambrí <hello@sergiodxa.com>
---
 docs/file-conventions/remix-config.md |   2 +
 docs/guides/single-fetch.md           | 199 ++++++++++++++++++++++++++
 2 files changed, 201 insertions(+)
 create mode 100644 docs/guides/single-fetch.md

diff --git a/docs/file-conventions/remix-config.md b/docs/file-conventions/remix-config.md
index 9f2c17e900c..ddabe21af11 100644
--- a/docs/file-conventions/remix-config.md
+++ b/docs/file-conventions/remix-config.md
@@ -78,6 +78,7 @@ The `future` config lets you opt-into future breaking changes via [Future Flags]
   - Fetchers that complete while still mounted no longer persist in [`useFetchers`][use-fetchers] since you can access those fetchers via [`useFetcher`][use-fetcher]
 - **`v3_relativeSplatPath`**: Fixes buggy relative path resolution in splat routes. Please see the [React Router docs][relativesplatpath] for more information.
 - **`v3_throwAbortReason`**: When a server-side request is aborted, Remix will throw the `request.signal.reason` instead of an error such as `new Error("query() call aborted...")`
+- **`unstable_singleFetch`**: Opt into [Single Fetch][single-fetch] behavior
 
 ## ignoredRouteFiles
 
@@ -282,3 +283,4 @@ There are a few conventions that Remix uses you should be aware of.
 [use-fetchers]: ../hooks/use-fetchers
 [use-fetcher]: ../hooks/use-fetcher
 [relativesplatpath]: https://reactrouter.com/en/main/hooks/use-resolved-path#splat-paths
+[single-fetch]: ../guides/single-fetch
diff --git a/docs/guides/single-fetch.md b/docs/guides/single-fetch.md
new file mode 100644
index 00000000000..3fcfbfe9d4d
--- /dev/null
+++ b/docs/guides/single-fetch.md
@@ -0,0 +1,199 @@
+---
+title: Single Fetch
+---
+
+# Single Fetch
+
+Remix introduced support for "Single Fetch" ([RFC][rfc]) behind the [`future.unstable_singleFetch`][future-flags] flag in [`v2.9.0`][2.9.0] which allows you to opt-into this behavior which will become the default in Remix v3.
+
+## Overview
+
+When you enable Single Fetch, Remix will make a single HTTP call to your server on client-side transitions, instead of multiple HTTP calls in parallel (one per loader). If you are currently returning `Response` instances from your loaders (i.e., `json`/`defer`) then you shouldn't _need_ to make many changes to your app code, but please read through the "breaking" changes below to be aware of some of the underlying behavior changes - specifically around serialization and status/header behavior.
+
+### Breaking Changes
+
+- Single fetch uses a new streaming format under the hood via [`turbo-stream`][turbo-stream], which means that we can stream down more complex data than just JSON
+- Naked objects returned from `loader` and `action` functions are no longer automatically converted into a JSON `Response` and are serialized as-is over the wire
+- Revalidation after an `action` `4xx`/`5xx` `Response` is now opt-in, versus opt-out
+- The `headers` function is no longer used when Single Fetch is enabled, in favor of the new `response` stub passed to your `loader`/`action` functions
+
+## Details
+
+### Streaming Data Format
+
+Previously, Remix used `JSON.stringify` to serialize your loader/action data over the wire, and needed to implement a custom streaming format to support `defer` responses.
+
+With Single Fetch, Remix now uses [`turbo-stream`][turbo-stream] under the hood which provides first class support for streaming and allows you to automatically serialize/deserialize more complex data than JSON. The following data types can be streamed down directly via `turbo-stream`: `BigInt`, `Date`, `Error`, `Map`, `Promise`, `RegExp`, `Set`, `Symbol`, and `URL`. Subtypes of `Error` are also supported as long as they have a globally available constructor on the client (`SyntaxError`, `TypeError`, etc.).
+
+This may or may not require any changes to your code once enabling Single Fetch:
+
+- ✅ `json` responses returned from `loader`/`action` functions will still be serialized via `JSON.stringify` so if you return a `Date`, you'll receive a `string` from `useLoaderData`/`useActionData`
+- ⚠️ If you're returning a `defer` instance or a naked object, it will now be serialized via `turbo-stream`, so if you return a `Date`, you'll receive a `Date` from `useLoaderData`/`useActionData`
+  - If you wish to maintain current behavior (excluding streaming `defer` responses), you may just wrap any existing naked object returns in `json`
+
+This also means that you no longer need to use the `defer` utility to send `Promise` instances over the wire! You can include a `Promise` anywhere in a naked object and pick it up on `useLoaderData().whatever`. You can also nest `Promise`'s if needed - but beware of potential UX implications.
+
+### React Rendering APIs
+
+In order to maintain consistency between document and data requests, `turbo-stream` is also used as the format for sending down data in initial document requests. This means that once opted-into Single Fetch, your application can no longer use [`renderToString`][rendertostring] and must use a React streaming renderer API such as [`renderToPipeableStream`][rendertopipeablestream] or [`renderToReadableStream`][rendertoreadablestream]) in [`entry.server.tsx`][entry-server].
+
+This does not mean you _have_ to stream down your HTTP response, you can still send the full document at once by leveraging the `onAllReady` option in `renderToPipeableStream`, or the `allReady` promise in `renderToReadableStream`.
+
+On the client side, this also means that your need to wrap your client-side [`hydrateRoot`][hydrateroot] call in a [`startTransition`][starttransition] call because the streamed data will be coming down wrapped in a `Suspense` boundary.
+
+### Streaming Timeout
+
+Previously, Remix has a concept of an `ABORT_TIMEOUT` built-into the default [`entry.server.tsx`][entry-server] files which would terminate the React renderer, but it didn't do anything in particular to clean up any pending deferred promises.
+
+Now that Remix is streaming internally, we can cancel the `turbo-stream` processing and automatically reject any pending promises and stream up those errors to the client. By default, this happens after 4950ms - a value that was chosen to be just under the current 5000ms `ABORT_DELAY` in most entry.server.tsx files - since we need to cancel the promises and let the rejections stream up through the React renderer prior to aborting the React sid eof things.
+
+You can control this by exporting a `streamTimeout` numeric value from your `entry.server.tsx` and Remix will use that as the number of milliseconds after which to reject any outstanding Promises from `loader`/`action`'s. It's recommended to decouple this value from the timeout in which you abort the React renderer - and you should always set the React timeout to a higher value so it has time to stream down the underlying rejections from your `streamTimeout`.
+
+### Type Inference
+
+The current generics support type inference but have a built-in assumption of a JSON-serialized response. With the new streaming format, this assumption no longer holds so `useLoaderData<typeof loader>()` will _not_ return the proper types because it would assume that a `Date` would be a string on the client 😕. Unfortunately, we can't make these types aware of a runtime future flag and we do not want to introduce another hook just for this. Thankfully, the manual typing is also much simpler without needing to think about JSON serialization, so the current recommendation is to skip the generics when opting into single fetch and manually cast the type yourself:
+
+```ts
+export async function loader() {
+  const data = await fetchSomeData(); // Assume this returns
+  return {
+    message: data.message, // <- string
+    date: data.date, // <- Date
+  };
+}
+
+export default function Component() {
+  // ❌ Before
+  const data = useLoaderData<typeof loader>();
+  //    ^? { message: string, date: string }
+
+  // ✅ After
+  const data = useLoaderData() as Awaited<
+    ReturnType<typeof loader>
+  >;
+  //    ^? { message: string, date: Date }
+}
+```
+
+In the next version of Remix, we may re-introduce this generic, but because it's so simple in the meantime you could wrap this up into your own utility:
+
+```ts
+function useTypedLoaderData<T>() {
+  return useLoaderData() as Awaited<ReturnType<T>>;
+}
+```
+
+### Revalidations
+
+Previously, Remix would always revalidate all active loaders after _any_ action submission, regardless of the result of the action. You could opt-out of revalidation on a per-route basis via [`shouldRevalidate`][should-revalidate].
+
+With Single Fetch, if an `action` returns or throws a `Response` with a `4xx/5xx` status code, Remix will _not revalidate_ loaders by default. You can then opt-into revalidation on a per-route basis. If an `action` returns or throws anything that is not a 4xx/5xx Response, then the revalidation behavior is unchanged. The reasoning here is that in most cases, if you return a `4xx`/`5xx` Response, you didn't actually mutate any data so there is no need to reload data.
+
+Revalidation is handled via a `?_routes` query string parameter on the single fetch HTTP call which limits the loaders being called. This means that when you are doing fine-grained revalidation, you will have cache enumerations based on the routes being requested - but all of the information is in the URL so you should not need any special CDN configurations (as opposed to if this was done via a custom header that required your CDN to respect the `Vary` header).
+
+This "functionality" is handled via the `future.unstable_skipActionErrorRevalidation` flag in React Router, which is always set to true when Single Fetch is enabled.
+
+### Headers
+
+The [`headers`][headers] function is no longer used when Single Fetch is enabled.
+Instead, your `loader`/`action` functions now receive a mutable `response` parameter unique to that execution:
+
+```ts
+type ResponseStub = {
+  status: numbers | undefined;
+  headers: Headers;
+};
+```
+
+- To alter the status of your HTTP Response, set the `status` field directly:
+  - `response.status = 201`
+- To set the headers on your HTTP Response, use the standard [`Headers`][mdn-headers] APIs:
+  - `response.headers.set`
+  - `response.headers.append`
+  - `response.headers.delete`
+
+```ts
+export async function action({ request, response }) {
+  if (!loggedIn(request)) {
+    response.status = 401;
+    response.headers.append("Set-Cookie", "foo=bar");
+    return { message: "Invalid Submission! " };
+  }
+  await addItemToDb(request);
+  return null;
+}
+```
+
+Each `loader`/`action` receives it's own unique `response` instance so you cannot see what other `loader`/`action` functions have set (which would be subject to race conditions). The resulting HTTP Response status and headers are determined as follows:
+
+- Status Code
+  - If all status codes are unset or have values <200, the deepest status code will be used for the HTTP response
+  - If any status codes are set to a value >=300, the highest >=300 value will be used for the HTTP Response
+- Headers
+  - Remix tracks header operations and will replay them on a fresh `Headers` instance after all handlers have completed
+  - These are replayed in order - action first (if present) followed by loaders in top-down order
+  - `headers.set` on any child handler will overwrite values from parent handlers
+  - `headers.append` can be used to set the same header from both a parent and child handler
+  - `headers.delete` can be used to delete a value set by a parent handler, but not a value set from a child handler
+
+Because single fetch supports naked object returns, and you no longer need to return a `Response` instance to set status/headers, the `json`/`redirect`/`redirectDocument`/`defer` utilities are considered deprecated when using Single Fetch. You may still continue returning normal `Response` instances and they'll apply status codes in the same way as the `response` stub, and will apply all headers via `headers.set` - overwriting any same-named header values from parents. If you need to append a header, you will need to switch from returning a `Response` instance to using the new `response` parameter.
+
+### Client Loaders
+
+If your app has route using [`clientLoader`][client-loader] functions, it's important to note that the behavior of Single Fetch will change slightly. Because `clientLoader` is intended to give you a way to opt-out of calling the server `loader` function - it would be incorrect for the Single Fetch call to execute that server loader. But we run all loaders in parallel and we don't want to _wait_ to make the call until we know which `clientLoader`'s are actually asking for server data.
+
+For example, consider the following `/a/b/c` routes:
+
+```ts
+// routes/a.tsx
+export function loader() {
+  return { data: "A" };
+}
+
+// routes/a.b.tsx
+export function loader() {
+  return { data: "B" };
+}
+
+// routes/a.b.c.tsx
+export function loader() {
+  return { data: "C" };
+}
+
+export function clientLoader({ serverLoader }) {
+  await doSomeStuff();
+  const data = await serverLoader();
+  return { data };
+}
+```
+
+If a user navigates from `/ -> /a/b/c`, then we need to run the server loaders for `a` and `b`, and the `clientLoader` for `c` - which may eventually (or may not) call it's own server `loader`. We can't decide to include the `c` server `loader` in a single fetch call when we want to fetch the `a`/`b` `loader`'s', nor can we delay until `c` actually makes the `serverLoader` call (or returns) without introducing a waterfall.
+
+Therefore, when you export a `clientLoader` that route opts-out of Single Fetch and when you call `serverLoader` it will make a single fetch to get only it's route server `loader`. All routes that do not export a `clientLoader` will be fetched in a singular HTTP request.
+
+So, on the above route setup a navigation from `/ -> /a/b/c` will result in a singular single-fetch call up front for routes `a` and `b`:
+
+```
+GET /a/b/c.data?_routes=routes/a,routes/b
+```
+
+And then when `c` calls `serverLoader`, it'll make it's own call for just the `c` server `loader`:
+
+```
+GET /a/b/c.data?_routes=routes/c
+```
+
+[future-flags]: ../file-conventions/remix-config#future
+[should-revalidate]: ../route/should-revalidate
+[entry-server]: ../file-conventions/entry.server
+[client-loader]: ../route/client-loader
+[2.9.0]: https://github.com/remix-run/remix/blob/main/CHANGELOG.md#v290
+[rfc]: https://github.com/remix-run/remix/discussions/7640
+[turbo-stream]: https://github.com/jacob-ebey/turbo-stream
+[rendertopipeablestream]: https://react.dev/reference/react-dom/server/renderToPipeableStream
+[rendertoreadablestream]: https://react.dev/reference/react-dom/server/renderToReadableStream
+[rendertostring]: https://react.dev/reference/react-dom/server/renderToString
+[hydrateroot]: https://react.dev/reference/react-dom/client/hydrateRoot
+[starttransition]: https://react.dev/reference/react/startTransition
+[headers]: ../route/headers
+[mdn-headers]: https://developer.mozilla.org/en-US/docs/Web/API/Headers

From 7639675ed6bf33ff9ba231c777018bc074c9bf34 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Wed, 27 Mar 2024 11:31:04 -0400
Subject: [PATCH 037/108] Bump router (#9147)

---
 integration/package.json                   |  2 +-
 packages/remix-dev/package.json            |  2 +-
 packages/remix-react/package.json          |  6 +--
 packages/remix-server-runtime/package.json |  2 +-
 packages/remix-testing/package.json        |  4 +-
 pnpm-lock.yaml                             | 50 +++++++++++-----------
 6 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/integration/package.json b/integration/package.json
index 619a96c8707..cb20fec7e6d 100644
--- a/integration/package.json
+++ b/integration/package.json
@@ -14,7 +14,7 @@
     "@remix-run/dev": "workspace:*",
     "@remix-run/express": "workspace:*",
     "@remix-run/node": "workspace:*",
-    "@remix-run/router": "0.0.0-experimental-0f302655",
+    "@remix-run/router": "1.16.0-pre.0",
     "@remix-run/server-runtime": "workspace:*",
     "@types/express": "^4.17.9",
     "@vanilla-extract/css": "^1.10.0",
diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json
index 1789ff2b438..707f7da6ee9 100644
--- a/packages/remix-dev/package.json
+++ b/packages/remix-dev/package.json
@@ -32,7 +32,7 @@
     "@mdx-js/mdx": "^2.3.0",
     "@npmcli/package-json": "^4.0.1",
     "@remix-run/node": "workspace:*",
-    "@remix-run/router": "0.0.0-experimental-0f302655",
+    "@remix-run/router": "1.16.0-pre.0",
     "@remix-run/server-runtime": "workspace:*",
     "@types/mdx": "^2.0.5",
     "@vanilla-extract/integration": "^6.2.0",
diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json
index 79eb341f290..09421915833 100644
--- a/packages/remix-react/package.json
+++ b/packages/remix-react/package.json
@@ -19,10 +19,10 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@remix-run/router": "0.0.0-experimental-0f302655",
+    "@remix-run/router": "1.16.0-pre.0",
     "@remix-run/server-runtime": "workspace:*",
-    "react-router": "0.0.0-experimental-0f302655",
-    "react-router-dom": "0.0.0-experimental-0f302655",
+    "react-router": "6.23.0-pre.0",
+    "react-router-dom": "6.23.0-pre.0",
     "turbo-stream": "^2.0.0"
   },
   "devDependencies": {
diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json
index 1d0548a4467..182e319efa6 100644
--- a/packages/remix-server-runtime/package.json
+++ b/packages/remix-server-runtime/package.json
@@ -19,7 +19,7 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@remix-run/router": "0.0.0-experimental-0f302655",
+    "@remix-run/router": "1.16.0-pre.0",
     "@types/cookie": "^0.6.0",
     "@web3-storage/multipart-parser": "^1.0.0",
     "cookie": "^0.6.0",
diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
index 81636d20bc2..2bac88cb046 100644
--- a/packages/remix-testing/package.json
+++ b/packages/remix-testing/package.json
@@ -21,8 +21,8 @@
   "dependencies": {
     "@remix-run/node": "workspace:*",
     "@remix-run/react": "workspace:*",
-    "@remix-run/router": "0.0.0-experimental-0f302655",
-    "react-router-dom": "0.0.0-experimental-0f302655"
+    "@remix-run/router": "1.16.0-pre.0",
+    "react-router-dom": "6.23.0-pre.0"
   },
   "devDependencies": {
     "@remix-run/server-runtime": "workspace:*",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a56de7cf336..cffee17d109 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -320,8 +320,8 @@ importers:
         specifier: workspace:*
         version: link:../packages/remix-node
       '@remix-run/router':
-        specifier: 0.0.0-experimental-0f302655
-        version: 0.0.0-experimental-0f302655
+        specifier: 1.16.0-pre.0
+        version: 1.16.0-pre.0
       '@remix-run/server-runtime':
         specifier: workspace:*
         version: link:../packages/remix-server-runtime
@@ -868,8 +868,8 @@ importers:
         specifier: ^2.8.1
         version: link:../remix-react
       '@remix-run/router':
-        specifier: 0.0.0-experimental-0f302655
-        version: 0.0.0-experimental-0f302655
+        specifier: 1.16.0-pre.0
+        version: 1.16.0-pre.0
       '@remix-run/server-runtime':
         specifier: workspace:*
         version: link:../remix-server-runtime
@@ -1211,17 +1211,17 @@ importers:
   packages/remix-react:
     dependencies:
       '@remix-run/router':
-        specifier: 0.0.0-experimental-0f302655
-        version: 0.0.0-experimental-0f302655
+        specifier: 1.16.0-pre.0
+        version: 1.16.0-pre.0
       '@remix-run/server-runtime':
         specifier: workspace:*
         version: link:../remix-server-runtime
       react-router:
-        specifier: 0.0.0-experimental-0f302655
-        version: 0.0.0-experimental-0f302655(react@18.2.0)
+        specifier: 6.23.0-pre.0
+        version: 6.23.0-pre.0(react@18.2.0)
       react-router-dom:
-        specifier: 0.0.0-experimental-0f302655
-        version: 0.0.0-experimental-0f302655(react-dom@18.2.0)(react@18.2.0)
+        specifier: 6.23.0-pre.0
+        version: 6.23.0-pre.0(react-dom@18.2.0)(react@18.2.0)
       turbo-stream:
         specifier: ^2.0.0
         version: 2.0.0
@@ -1297,8 +1297,8 @@ importers:
   packages/remix-server-runtime:
     dependencies:
       '@remix-run/router':
-        specifier: 0.0.0-experimental-0f302655
-        version: 0.0.0-experimental-0f302655
+        specifier: 1.16.0-pre.0
+        version: 1.16.0-pre.0
       '@types/cookie':
         specifier: ^0.6.0
         version: 0.6.0
@@ -1334,11 +1334,11 @@ importers:
         specifier: workspace:*
         version: link:../remix-react
       '@remix-run/router':
-        specifier: 0.0.0-experimental-0f302655
-        version: 0.0.0-experimental-0f302655
+        specifier: 1.16.0-pre.0
+        version: 1.16.0-pre.0
       react-router-dom:
-        specifier: 0.0.0-experimental-0f302655
-        version: 0.0.0-experimental-0f302655(react-dom@18.2.0)(react@18.2.0)
+        specifier: 6.23.0-pre.0
+        version: 6.23.0-pre.0(react-dom@18.2.0)(react@18.2.0)
     devDependencies:
       '@remix-run/server-runtime':
         specifier: workspace:*
@@ -4193,8 +4193,8 @@ packages:
       - encoding
     dev: false
 
-  /@remix-run/router@0.0.0-experimental-0f302655:
-    resolution: {integrity: sha512-/Lb7eqBbMON5ue+lxTflS8lZ2WwXxk/iA+YRbsmuu3gn/pb8eto5JfyV3H/NPjlL+oxxXxcYGvzWor55OXIlSQ==}
+  /@remix-run/router@1.16.0-pre.0:
+    resolution: {integrity: sha512-4KYbcmBcjX1HO/sLPZIcY87YWTF3e5qs9KTTieXE0HNukV2m199yTkMIjcmzTNL6w0wDj5YYc2YiXxm4W9qsTw==}
     engines: {node: '>=14.0.0'}
     dev: false
 
@@ -12784,26 +12784,26 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: false
 
-  /react-router-dom@0.0.0-experimental-0f302655(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-UmaABR8mrGMrcH/EHt2bQYFFX2faICJEXg+Q+jUSXQhiN8lsqDGOF7chHYzU17Ud7NtsxdoeFeVIXIpXwjE4xQ==}
+  /react-router-dom@6.23.0-pre.0(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-TDEljjV6XwOEb9gp6FFNquAB0yY490lhSZRo4YNDPI8+QEA0n3yJ2VfIZLmxR70ljnFBwYOnWmNl94EHom/JjQ==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
       react: '>=16.8'
       react-dom: '>=16.8'
     dependencies:
-      '@remix-run/router': 0.0.0-experimental-0f302655
+      '@remix-run/router': 1.16.0-pre.0
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      react-router: 0.0.0-experimental-0f302655(react@18.2.0)
+      react-router: 6.23.0-pre.0(react@18.2.0)
     dev: false
 
-  /react-router@0.0.0-experimental-0f302655(react@18.2.0):
-    resolution: {integrity: sha512-0A1d352GLuI23uIuPJgRDTqEz90KLG7ZmZ/mZPhv+bw8pymeAAVL8WAHIjjBFePvsjUVS30iV19DPvbgDUU+PA==}
+  /react-router@6.23.0-pre.0(react@18.2.0):
+    resolution: {integrity: sha512-GawzByLrAoOr4Sc0ybAuYBTJmtysK8I7p3VuBQCzDCqXzu10uAP7tu0Iy+mv0SGkmzKpPXg4PUO26UQ9bBH7bg==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
       react: '>=16.8'
     dependencies:
-      '@remix-run/router': 0.0.0-experimental-0f302655
+      '@remix-run/router': 1.16.0-pre.0
       react: 18.2.0
     dev: false
 

From 8838b45e4fca8a1f6c05581c823266cffddb4a8d Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Wed, 27 Mar 2024 12:01:39 -0400
Subject: [PATCH 038/108] Move single fetch server code into standalone file
 (#9148)

---
 packages/remix-server-runtime/index.ts        |   8 +-
 packages/remix-server-runtime/server.ts       | 452 +-----------------
 packages/remix-server-runtime/single-fetch.ts | 445 +++++++++++++++++
 3 files changed, 460 insertions(+), 445 deletions(-)
 create mode 100644 packages/remix-server-runtime/single-fetch.ts

diff --git a/packages/remix-server-runtime/index.ts b/packages/remix-server-runtime/index.ts
index 845ae0d55de..7744129cdb7 100644
--- a/packages/remix-server-runtime/index.ts
+++ b/packages/remix-server-runtime/index.ts
@@ -8,11 +8,9 @@ export { defer, json, redirect, redirectDocument } from "./responses";
 export type {
   SingleFetchResult as UNSAFE_SingleFetchResult,
   SingleFetchResults as UNSAFE_SingleFetchResults,
-} from "./server";
-export {
-  createRequestHandler,
-  SingleFetchRedirectSymbol as UNSAFE_SingleFetchRedirectSymbol,
-} from "./server";
+} from "./single-fetch";
+export { SingleFetchRedirectSymbol as UNSAFE_SingleFetchRedirectSymbol } from "./single-fetch";
+export { createRequestHandler } from "./server";
 export {
   createSession,
   createSessionStorageFactory,
diff --git a/packages/remix-server-runtime/server.ts b/packages/remix-server-runtime/server.ts
index f7e30332914..269f56551cb 100644
--- a/packages/remix-server-runtime/server.ts
+++ b/packages/remix-server-runtime/server.ts
@@ -2,8 +2,6 @@ import type {
   UNSAFE_DeferredData as DeferredData,
   ErrorResponse,
   StaticHandler,
-  unstable_DataStrategyFunctionArgs as DataStrategyFunctionArgs,
-  StaticHandlerContext,
 } from "@remix-run/router";
 import {
   UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL,
@@ -14,35 +12,37 @@ import {
   stripBasename,
   UNSAFE_ErrorResponseImpl as ErrorResponseImpl,
 } from "@remix-run/router";
-import { encode } from "turbo-stream";
 
 import type { AppLoadContext } from "./data";
 import type { HandleErrorFunction, ServerBuild } from "./build";
 import type { EntryContext } from "./entry";
 import { createEntryRouteModules } from "./entry";
-import {
-  sanitizeError,
-  sanitizeErrors,
-  serializeError,
-  serializeErrors,
-} from "./errors";
+import { sanitizeErrors, serializeError, serializeErrors } from "./errors";
 import { getDocumentHeaders } from "./headers";
 import invariant from "./invariant";
 import { ServerMode, isServerMode } from "./mode";
 import { matchServerRoutes } from "./routeMatching";
-import type { ResponseStub, ResponseStubOperation } from "./routeModules";
-import { ResponseStubOperationsSymbol } from "./routeModules";
 import type { ServerRoute } from "./routes";
 import { createStaticHandlerDataRoutes, createRoutes } from "./routes";
 import {
   createDeferredReadableStream,
-  isDeferredData,
   isRedirectResponse,
   isRedirectStatusCode,
   isResponse,
 } from "./responses";
 import { createServerHandoffString } from "./serverHandoff";
 import { getDevServerHooks } from "./dev";
+import type { SingleFetchResult, SingleFetchResults } from "./single-fetch";
+import {
+  encodeViaTurboStream,
+  getResponseStubs,
+  getSingleFetchDataStrategy,
+  getSingleFetchRedirect,
+  mergeResponseStubs,
+  singleFetchAction,
+  singleFetchLoaders,
+  SingleFetchRedirectSymbol,
+} from "./single-fetch";
 
 export type RequestHandler = (
   request: Request,
@@ -85,9 +85,6 @@ function derive(build: ServerBuild, mode?: string) {
   };
 }
 
-export const SingleFetchRedirectSymbol = Symbol("SingleFetchRedirect");
-export const ResponseStubActionSymbol = Symbol("ResponseStubAction");
-
 export const createRequestHandler: CreateRequestHandlerFunction = (
   build,
   mode
@@ -329,22 +326,6 @@ async function handleDataRequest(
   }
 }
 
-type SingleFetchRedirectResult = {
-  redirect: string;
-  status: number;
-  revalidate: boolean;
-  reload: boolean;
-};
-export type SingleFetchResult =
-  | { data: unknown }
-  | { error: unknown }
-  | SingleFetchRedirectResult;
-
-export type SingleFetchResults = {
-  [key: string]: SingleFetchResult;
-  [SingleFetchRedirectSymbol]?: SingleFetchRedirectResult;
-};
-
 async function handleSingleFetchRequest(
   serverMode: ServerMode,
   build: ServerBuild,
@@ -395,192 +376,6 @@ async function handleSingleFetchRequest(
   );
 }
 
-async function singleFetchAction(
-  serverMode: ServerMode,
-  staticHandler: StaticHandler,
-  request: Request,
-  handlerUrl: URL,
-  loadContext: AppLoadContext,
-  handleError: (err: unknown) => void
-): Promise<{ result: SingleFetchResult; headers: Headers; status: number }> {
-  try {
-    let handlerRequest = new Request(handlerUrl, {
-      method: request.method,
-      body: request.body,
-      headers: request.headers,
-      signal: request.signal,
-      ...(request.body ? { duplex: "half" } : undefined),
-    });
-
-    let responseStubs = getResponseStubs();
-    let result = await staticHandler.query(handlerRequest, {
-      requestContext: loadContext,
-      skipLoaderErrorBubbling: true,
-      skipLoaders: true,
-      unstable_dataStrategy: getSingleFetchDataStrategy(responseStubs),
-    });
-
-    // Unlike `handleDataRequest`, when singleFetch is enabled, queryRoute does
-    // let non-Response return values through
-    if (isResponse(result)) {
-      return {
-        result: getSingleFetchRedirect(result.status, result.headers),
-        headers: result.headers,
-        status: 200,
-      };
-    }
-
-    let context = result;
-
-    let singleFetchResult: SingleFetchResult;
-    let { statusCode, headers } = mergeResponseStubs(context, responseStubs);
-
-    if (isRedirectStatusCode(statusCode) && headers.has("Location")) {
-      return {
-        result: getSingleFetchRedirect(statusCode, headers),
-        headers,
-        status: 200, // Don't want the `fetch` call to follow the redirect
-      };
-    }
-
-    // Sanitize errors outside of development environments
-    if (context.errors) {
-      Object.values(context.errors).forEach((err) => {
-        // @ts-expect-error This is "private" from users but intended for internal use
-        if (!isRouteErrorResponse(err) || err.error) {
-          handleError(err);
-        }
-      });
-      context.errors = sanitizeErrors(context.errors, serverMode);
-    }
-
-    if (context.errors) {
-      let error = Object.values(context.errors)[0];
-      singleFetchResult = { error: isResponseStub(error) ? null : error };
-    } else {
-      singleFetchResult = { data: Object.values(context.actionData || {})[0] };
-    }
-
-    return {
-      result: singleFetchResult,
-      headers,
-      status: statusCode,
-    };
-  } catch (error) {
-    handleError(error);
-    // These should only be internal remix errors, no need to deal with responseStubs
-    return {
-      result: { error },
-      headers: new Headers(),
-      status: 500,
-    };
-  }
-}
-
-async function singleFetchLoaders(
-  serverMode: ServerMode,
-  staticHandler: StaticHandler,
-  request: Request,
-  handlerUrl: URL,
-  loadContext: AppLoadContext,
-  handleError: (err: unknown) => void
-): Promise<{ result: SingleFetchResults; headers: Headers; status: number }> {
-  try {
-    let handlerRequest = new Request(handlerUrl, {
-      headers: request.headers,
-      signal: request.signal,
-    });
-    let loadRouteIds =
-      new URL(request.url).searchParams.get("_routes")?.split(",") || undefined;
-
-    let responseStubs = getResponseStubs();
-    let result = await staticHandler.query(handlerRequest, {
-      requestContext: loadContext,
-      loadRouteIds,
-      skipLoaderErrorBubbling: true,
-      unstable_dataStrategy: getSingleFetchDataStrategy(responseStubs),
-    });
-
-    if (isResponse(result)) {
-      return {
-        result: {
-          [SingleFetchRedirectSymbol]: getSingleFetchRedirect(
-            result.status,
-            result.headers
-          ),
-        },
-        headers: result.headers,
-        status: 200, // Don't want the `fetch` call to follow the redirect
-      };
-    }
-
-    let context = result;
-
-    let { statusCode, headers } = mergeResponseStubs(context, responseStubs);
-
-    if (isRedirectStatusCode(statusCode) && headers.has("Location")) {
-      return {
-        result: {
-          [SingleFetchRedirectSymbol]: getSingleFetchRedirect(
-            statusCode,
-            headers
-          ),
-        },
-        headers,
-        status: 200, // Don't want the `fetch` call to follow the redirect
-      };
-    }
-
-    // Sanitize errors outside of development environments
-    if (context.errors) {
-      Object.values(context.errors).forEach((err) => {
-        // @ts-expect-error This is "private" from users but intended for internal use
-        if (!isRouteErrorResponse(err) || err.error) {
-          handleError(err);
-        }
-      });
-      context.errors = sanitizeErrors(context.errors, serverMode);
-    }
-
-    // Aggregate results based on the matches we intended to load since we get
-    // `null` values back in `context.loaderData` for routes we didn't load
-    let results: SingleFetchResults = {};
-    let loadedMatches = loadRouteIds
-      ? context.matches.filter(
-          (m) => m.route.loader && loadRouteIds!.includes(m.route.id)
-        )
-      : context.matches;
-
-    loadedMatches.forEach((m) => {
-      let data = context.loaderData?.[m.route.id];
-      let error = context.errors?.[m.route.id];
-      if (error !== undefined) {
-        if (isResponseStub(error)) {
-          results[m.route.id] = { error: null };
-        } else {
-          results[m.route.id] = { error };
-        }
-      } else if (data !== undefined) {
-        results[m.route.id] = { data };
-      }
-    });
-
-    return {
-      result: results,
-      headers,
-      status: statusCode,
-    };
-  } catch (error: unknown) {
-    handleError(error);
-    // These should only be internal remix errors, no need to deal with responseStubs
-    return {
-      result: { root: { error } },
-      headers: new Headers(),
-      status: 500,
-    };
-  }
-}
-
 async function handleDocumentRequest(
   serverMode: ServerMode,
   build: ServerBuild,
@@ -859,229 +654,6 @@ function unwrapResponse(response: Response) {
     : response.text();
 }
 
-function getResponseStub(status?: number) {
-  let headers = new Headers();
-  let operations: ResponseStubOperation[] = [];
-  let headersProxy = new Proxy(headers, {
-    get(target, prop, receiver) {
-      if (prop === "set" || prop === "append" || prop === "delete") {
-        return (name: string, value: string) => {
-          operations.push([prop, name, value]);
-          Reflect.apply(target[prop], target, [name, value]);
-        };
-      }
-      return Reflect.get(target, prop, receiver);
-    },
-  });
-  return {
-    status,
-    headers: headersProxy,
-    [ResponseStubOperationsSymbol]: operations,
-  };
-}
-
-function getSingleFetchDataStrategy(
-  responseStubs: ReturnType<typeof getResponseStubs>
-) {
-  return async ({ request, matches }: DataStrategyFunctionArgs) => {
-    let results = await Promise.all(
-      matches.map(async (match) => {
-        let responseStub: ResponseStub | undefined;
-        if (request.method !== "GET") {
-          responseStub = responseStubs[ResponseStubActionSymbol];
-        } else {
-          responseStub = responseStubs[match.route.id];
-        }
-
-        let result = await match.resolve(async (handler) => {
-          let data = await handler({ response: responseStub });
-          return { type: "data", result: data };
-        });
-
-        // Transfer raw Response status/headers to responseStubs
-        if (isResponse(result.result)) {
-          proxyResponseToResponseStub(
-            result.result.status,
-            result.result.headers,
-            responseStub
-          );
-        } else if (isDeferredData(result.result) && result.result.init) {
-          proxyResponseToResponseStub(
-            result.result.init.status,
-            new Headers(result.result.init.headers),
-            responseStub
-          );
-        }
-
-        return result;
-      })
-    );
-    return results;
-  };
-}
-
-function proxyResponseToResponseStub(
-  status: number | undefined,
-  headers: Headers,
-  responseStub: ResponseStub
-) {
-  if (status != null && responseStub.status == null) {
-    responseStub.status = status;
-  }
-  for (let [k, v] of headers) {
-    if (k.toLowerCase() !== "set-cookie") {
-      responseStub.headers.set(k, v);
-    }
-  }
-
-  // Unsure why this is complaining?  It's fine in VSCode but fails with tsc...
-  // @ts-ignore - ignoring instead of expecting because otherwise build fails locally
-  for (let v of headers.getSetCookie()) {
-    responseStub.headers.append("Set-Cookie", v);
-  }
-}
-
-function isResponseStub(value: any): value is ResponseStub {
-  return (
-    value && typeof value === "object" && ResponseStubOperationsSymbol in value
-  );
-}
-
-function getResponseStubs() {
-  return new Proxy({} as Record<string | symbol, ResponseStub>, {
-    get(responseStubCache, prop) {
-      let cached = responseStubCache[prop];
-      if (!cached) {
-        responseStubCache[prop] = cached = getResponseStub();
-      }
-      return cached;
-    },
-  });
-}
-
-function mergeResponseStubs(
-  context: StaticHandlerContext,
-  responseStubs: ReturnType<typeof getResponseStubs>
-) {
-  let statusCode: number | undefined = undefined;
-  let headers = new Headers();
-
-  // Action followed by top-down loaders
-  let actionStub = responseStubs[ResponseStubActionSymbol];
-  let stubs = [
-    actionStub,
-    ...context.matches.map((m) => responseStubs[m.route.id]),
-  ];
-
-  for (let stub of stubs) {
-    // Take the highest error/redirect, or the lowest success value - preferring
-    // action 200's over loader 200s
-    if (
-      // first status found on the way down
-      (statusCode === undefined && stub.status) ||
-      // deeper 2xx status found while not overriding the action status
-      (statusCode !== undefined &&
-        statusCode < 300 &&
-        stub.status &&
-        statusCode !== actionStub?.status)
-    ) {
-      statusCode = stub.status;
-    }
-
-    // Replay headers operations in order
-    let ops = stub[ResponseStubOperationsSymbol];
-    for (let [op, ...args] of ops) {
-      // @ts-expect-error
-      headers[op](...args);
-    }
-  }
-
-  // If no response stubs set it, use whatever we got back from the router
-  // context which handles internal ErrorResponse cases like 404/405's where
-  // we may never run a loader/action
-  if (statusCode === undefined) {
-    statusCode = context.statusCode;
-  }
-  if (statusCode === undefined) {
-    statusCode = 200;
-  }
-
-  return { statusCode, headers };
-}
-
-function getSingleFetchRedirect(
-  status: number,
-  headers: Headers
-): SingleFetchRedirectResult {
-  return {
-    redirect: headers.get("Location")!,
-    status,
-    revalidate:
-      // Technically X-Remix-Revalidate isn't needed here - that was an implementation
-      // detail of ?_data requests as our way to tell the front end to revalidate when
-      // we didn't have a response body to include that information in.
-      // With single fetch, we tell the front end via this revalidate boolean field.
-      // However, we're respecting it for now because it may be something folks have
-      // used in their own responses
-      // TODO(v3): Consider removing or making this official public API
-      headers.has("X-Remix-Revalidate") || headers.has("Set-Cookie"),
-    reload: headers.has("X-Remix-Reload-Document"),
-  };
-}
-
-// Note: If you change this function please change the corresponding
-// decodeViaTurboStream function in server-runtime
-function encodeViaTurboStream(
-  data: any,
-  requestSignal: AbortSignal,
-  streamTimeout: number | undefined,
-  serverMode: ServerMode
-) {
-  let controller = new AbortController();
-  // How long are we willing to wait for all of the promises in `data` to resolve
-  // before timing out?  We default this to 50ms shorter than the default value for
-  // `ABORT_DELAY` in our built-in `entry.server.tsx` so that once we reject we
-  // have time to flush the rejections down through React's rendering stream before `
-  // we call abort() on that.  If the user provides their own it's up to them to
-  // decouple the aborting of the stream from the aborting of React's renderToPipeableStream
-  let timeoutId = setTimeout(
-    () => controller.abort(new Error("Server Timeout")),
-    typeof streamTimeout === "number" ? streamTimeout : 4950
-  );
-  requestSignal.addEventListener("abort", () => clearTimeout(timeoutId));
-
-  return encode(data, {
-    signal: controller.signal,
-    plugins: [
-      (value) => {
-        // Even though we sanitized errors on context.errors prior to responding,
-        // we still need to handle this for any deferred data that rejects with an
-        // Error - as those will not be sanitized yet
-        if (value instanceof Error) {
-          let { name, message, stack } =
-            serverMode === ServerMode.Production
-              ? sanitizeError(value, serverMode)
-              : value;
-          return ["SanitizedError", name, message, stack];
-        }
-
-        if (value instanceof ErrorResponseImpl) {
-          let { data, status, statusText } = value;
-          return ["ErrorResponse", data, status, statusText];
-        }
-
-        if (
-          value &&
-          typeof value === "object" &&
-          SingleFetchRedirectSymbol in value
-        ) {
-          return ["SingleFetchRedirect", value[SingleFetchRedirectSymbol]];
-        }
-      },
-    ],
-  });
-}
-
 function createRemixRedirectResponse(
   response: Response,
   basename: string | undefined
diff --git a/packages/remix-server-runtime/single-fetch.ts b/packages/remix-server-runtime/single-fetch.ts
new file mode 100644
index 00000000000..2d983b6fd46
--- /dev/null
+++ b/packages/remix-server-runtime/single-fetch.ts
@@ -0,0 +1,445 @@
+import type {
+  StaticHandler,
+  unstable_DataStrategyFunctionArgs as DataStrategyFunctionArgs,
+  StaticHandlerContext,
+} from "@remix-run/router";
+import {
+  isRouteErrorResponse,
+  UNSAFE_ErrorResponseImpl as ErrorResponseImpl,
+} from "@remix-run/router";
+import { encode } from "turbo-stream";
+
+import type { AppLoadContext } from "./data";
+import { sanitizeError, sanitizeErrors } from "./errors";
+import { ServerMode } from "./mode";
+import type { ResponseStub, ResponseStubOperation } from "./routeModules";
+import { ResponseStubOperationsSymbol } from "./routeModules";
+import { isDeferredData, isRedirectStatusCode, isResponse } from "./responses";
+
+export const SingleFetchRedirectSymbol = Symbol("SingleFetchRedirect");
+const ResponseStubActionSymbol = Symbol("ResponseStubAction");
+
+type SingleFetchRedirectResult = {
+  redirect: string;
+  status: number;
+  revalidate: boolean;
+  reload: boolean;
+};
+export type SingleFetchResult =
+  | { data: unknown }
+  | { error: unknown }
+  | SingleFetchRedirectResult;
+
+export type SingleFetchResults = {
+  [key: string]: SingleFetchResult;
+  [SingleFetchRedirectSymbol]?: SingleFetchRedirectResult;
+};
+
+export function getSingleFetchDataStrategy(
+  responseStubs: ReturnType<typeof getResponseStubs>
+) {
+  return async ({ request, matches }: DataStrategyFunctionArgs) => {
+    let results = await Promise.all(
+      matches.map(async (match) => {
+        let responseStub: ResponseStub | undefined;
+        if (request.method !== "GET") {
+          responseStub = responseStubs[ResponseStubActionSymbol];
+        } else {
+          responseStub = responseStubs[match.route.id];
+        }
+
+        let result = await match.resolve(async (handler) => {
+          let data = await handler({ response: responseStub });
+          return { type: "data", result: data };
+        });
+
+        // Transfer raw Response status/headers to responseStubs
+        if (isResponse(result.result)) {
+          proxyResponseToResponseStub(
+            result.result.status,
+            result.result.headers,
+            responseStub
+          );
+        } else if (isDeferredData(result.result) && result.result.init) {
+          proxyResponseToResponseStub(
+            result.result.init.status,
+            new Headers(result.result.init.headers),
+            responseStub
+          );
+        }
+
+        return result;
+      })
+    );
+    return results;
+  };
+}
+
+export async function singleFetchAction(
+  serverMode: ServerMode,
+  staticHandler: StaticHandler,
+  request: Request,
+  handlerUrl: URL,
+  loadContext: AppLoadContext,
+  handleError: (err: unknown) => void
+): Promise<{ result: SingleFetchResult; headers: Headers; status: number }> {
+  try {
+    let handlerRequest = new Request(handlerUrl, {
+      method: request.method,
+      body: request.body,
+      headers: request.headers,
+      signal: request.signal,
+      ...(request.body ? { duplex: "half" } : undefined),
+    });
+
+    let responseStubs = getResponseStubs();
+    let result = await staticHandler.query(handlerRequest, {
+      requestContext: loadContext,
+      skipLoaderErrorBubbling: true,
+      skipLoaders: true,
+      unstable_dataStrategy: getSingleFetchDataStrategy(responseStubs),
+    });
+
+    // Unlike `handleDataRequest`, when singleFetch is enabled, queryRoute does
+    // let non-Response return values through
+    if (isResponse(result)) {
+      return {
+        result: getSingleFetchRedirect(result.status, result.headers),
+        headers: result.headers,
+        status: 200,
+      };
+    }
+
+    let context = result;
+
+    let singleFetchResult: SingleFetchResult;
+    let { statusCode, headers } = mergeResponseStubs(context, responseStubs);
+
+    if (isRedirectStatusCode(statusCode) && headers.has("Location")) {
+      return {
+        result: getSingleFetchRedirect(statusCode, headers),
+        headers,
+        status: 200, // Don't want the `fetch` call to follow the redirect
+      };
+    }
+
+    // Sanitize errors outside of development environments
+    if (context.errors) {
+      Object.values(context.errors).forEach((err) => {
+        // @ts-expect-error This is "private" from users but intended for internal use
+        if (!isRouteErrorResponse(err) || err.error) {
+          handleError(err);
+        }
+      });
+      context.errors = sanitizeErrors(context.errors, serverMode);
+    }
+
+    if (context.errors) {
+      let error = Object.values(context.errors)[0];
+      singleFetchResult = { error: isResponseStub(error) ? null : error };
+    } else {
+      singleFetchResult = { data: Object.values(context.actionData || {})[0] };
+    }
+
+    return {
+      result: singleFetchResult,
+      headers,
+      status: statusCode,
+    };
+  } catch (error) {
+    handleError(error);
+    // These should only be internal remix errors, no need to deal with responseStubs
+    return {
+      result: { error },
+      headers: new Headers(),
+      status: 500,
+    };
+  }
+}
+
+export async function singleFetchLoaders(
+  serverMode: ServerMode,
+  staticHandler: StaticHandler,
+  request: Request,
+  handlerUrl: URL,
+  loadContext: AppLoadContext,
+  handleError: (err: unknown) => void
+): Promise<{ result: SingleFetchResults; headers: Headers; status: number }> {
+  try {
+    let handlerRequest = new Request(handlerUrl, {
+      headers: request.headers,
+      signal: request.signal,
+    });
+    let loadRouteIds =
+      new URL(request.url).searchParams.get("_routes")?.split(",") || undefined;
+
+    let responseStubs = getResponseStubs();
+    let result = await staticHandler.query(handlerRequest, {
+      requestContext: loadContext,
+      loadRouteIds,
+      skipLoaderErrorBubbling: true,
+      unstable_dataStrategy: getSingleFetchDataStrategy(responseStubs),
+    });
+
+    if (isResponse(result)) {
+      return {
+        result: {
+          [SingleFetchRedirectSymbol]: getSingleFetchRedirect(
+            result.status,
+            result.headers
+          ),
+        },
+        headers: result.headers,
+        status: 200, // Don't want the `fetch` call to follow the redirect
+      };
+    }
+
+    let context = result;
+
+    let { statusCode, headers } = mergeResponseStubs(context, responseStubs);
+
+    if (isRedirectStatusCode(statusCode) && headers.has("Location")) {
+      return {
+        result: {
+          [SingleFetchRedirectSymbol]: getSingleFetchRedirect(
+            statusCode,
+            headers
+          ),
+        },
+        headers,
+        status: 200, // Don't want the `fetch` call to follow the redirect
+      };
+    }
+
+    // Sanitize errors outside of development environments
+    if (context.errors) {
+      Object.values(context.errors).forEach((err) => {
+        // @ts-expect-error This is "private" from users but intended for internal use
+        if (!isRouteErrorResponse(err) || err.error) {
+          handleError(err);
+        }
+      });
+      context.errors = sanitizeErrors(context.errors, serverMode);
+    }
+
+    // Aggregate results based on the matches we intended to load since we get
+    // `null` values back in `context.loaderData` for routes we didn't load
+    let results: SingleFetchResults = {};
+    let loadedMatches = loadRouteIds
+      ? context.matches.filter(
+          (m) => m.route.loader && loadRouteIds!.includes(m.route.id)
+        )
+      : context.matches;
+
+    loadedMatches.forEach((m) => {
+      let data = context.loaderData?.[m.route.id];
+      let error = context.errors?.[m.route.id];
+      if (error !== undefined) {
+        if (isResponseStub(error)) {
+          results[m.route.id] = { error: null };
+        } else {
+          results[m.route.id] = { error };
+        }
+      } else if (data !== undefined) {
+        results[m.route.id] = { data };
+      }
+    });
+
+    return {
+      result: results,
+      headers,
+      status: statusCode,
+    };
+  } catch (error: unknown) {
+    handleError(error);
+    // These should only be internal remix errors, no need to deal with responseStubs
+    return {
+      result: { root: { error } },
+      headers: new Headers(),
+      status: 500,
+    };
+  }
+}
+
+export function isResponseStub(value: any): value is ResponseStub {
+  return (
+    value && typeof value === "object" && ResponseStubOperationsSymbol in value
+  );
+}
+
+function getResponseStub(status?: number) {
+  let headers = new Headers();
+  let operations: ResponseStubOperation[] = [];
+  let headersProxy = new Proxy(headers, {
+    get(target, prop, receiver) {
+      if (prop === "set" || prop === "append" || prop === "delete") {
+        return (name: string, value: string) => {
+          operations.push([prop, name, value]);
+          Reflect.apply(target[prop], target, [name, value]);
+        };
+      }
+      return Reflect.get(target, prop, receiver);
+    },
+  });
+  return {
+    status,
+    headers: headersProxy,
+    [ResponseStubOperationsSymbol]: operations,
+  };
+}
+
+export function getResponseStubs() {
+  return new Proxy({} as Record<string | symbol, ResponseStub>, {
+    get(responseStubCache, prop) {
+      let cached = responseStubCache[prop];
+      if (!cached) {
+        responseStubCache[prop] = cached = getResponseStub();
+      }
+      return cached;
+    },
+  });
+}
+
+function proxyResponseToResponseStub(
+  status: number | undefined,
+  headers: Headers,
+  responseStub: ResponseStub
+) {
+  if (status != null && responseStub.status == null) {
+    responseStub.status = status;
+  }
+  for (let [k, v] of headers) {
+    if (k.toLowerCase() !== "set-cookie") {
+      responseStub.headers.set(k, v);
+    }
+  }
+
+  // Unsure why this is complaining?  It's fine in VSCode but fails with tsc...
+  // @ts-ignore - ignoring instead of expecting because otherwise build fails locally
+  for (let v of headers.getSetCookie()) {
+    responseStub.headers.append("Set-Cookie", v);
+  }
+}
+
+export function mergeResponseStubs(
+  context: StaticHandlerContext,
+  responseStubs: ReturnType<typeof getResponseStubs>
+) {
+  let statusCode: number | undefined = undefined;
+  let headers = new Headers();
+
+  // Action followed by top-down loaders
+  let actionStub = responseStubs[ResponseStubActionSymbol];
+  let stubs = [
+    actionStub,
+    ...context.matches.map((m) => responseStubs[m.route.id]),
+  ];
+
+  for (let stub of stubs) {
+    // Take the highest error/redirect, or the lowest success value - preferring
+    // action 200's over loader 200s
+    if (
+      // first status found on the way down
+      (statusCode === undefined && stub.status) ||
+      // deeper 2xx status found while not overriding the action status
+      (statusCode !== undefined &&
+        statusCode < 300 &&
+        stub.status &&
+        statusCode !== actionStub?.status)
+    ) {
+      statusCode = stub.status;
+    }
+
+    // Replay headers operations in order
+    let ops = stub[ResponseStubOperationsSymbol];
+    for (let [op, ...args] of ops) {
+      // @ts-expect-error
+      headers[op](...args);
+    }
+  }
+
+  // If no response stubs set it, use whatever we got back from the router
+  // context which handles internal ErrorResponse cases like 404/405's where
+  // we may never run a loader/action
+  if (statusCode === undefined) {
+    statusCode = context.statusCode;
+  }
+  if (statusCode === undefined) {
+    statusCode = 200;
+  }
+
+  return { statusCode, headers };
+}
+
+export function getSingleFetchRedirect(
+  status: number,
+  headers: Headers
+): SingleFetchRedirectResult {
+  return {
+    redirect: headers.get("Location")!,
+    status,
+    revalidate:
+      // Technically X-Remix-Revalidate isn't needed here - that was an implementation
+      // detail of ?_data requests as our way to tell the front end to revalidate when
+      // we didn't have a response body to include that information in.
+      // With single fetch, we tell the front end via this revalidate boolean field.
+      // However, we're respecting it for now because it may be something folks have
+      // used in their own responses
+      // TODO(v3): Consider removing or making this official public API
+      headers.has("X-Remix-Revalidate") || headers.has("Set-Cookie"),
+    reload: headers.has("X-Remix-Reload-Document"),
+  };
+}
+
+// Note: If you change this function please change the corresponding
+// decodeViaTurboStream function in server-runtime
+export function encodeViaTurboStream(
+  data: any,
+  requestSignal: AbortSignal,
+  streamTimeout: number | undefined,
+  serverMode: ServerMode
+) {
+  let controller = new AbortController();
+  // How long are we willing to wait for all of the promises in `data` to resolve
+  // before timing out?  We default this to 50ms shorter than the default value for
+  // `ABORT_DELAY` in our built-in `entry.server.tsx` so that once we reject we
+  // have time to flush the rejections down through React's rendering stream before `
+  // we call abort() on that.  If the user provides their own it's up to them to
+  // decouple the aborting of the stream from the aborting of React's renderToPipeableStream
+  let timeoutId = setTimeout(
+    () => controller.abort(new Error("Server Timeout")),
+    typeof streamTimeout === "number" ? streamTimeout : 4950
+  );
+  requestSignal.addEventListener("abort", () => clearTimeout(timeoutId));
+
+  return encode(data, {
+    signal: controller.signal,
+    plugins: [
+      (value) => {
+        // Even though we sanitized errors on context.errors prior to responding,
+        // we still need to handle this for any deferred data that rejects with an
+        // Error - as those will not be sanitized yet
+        if (value instanceof Error) {
+          let { name, message, stack } =
+            serverMode === ServerMode.Production
+              ? sanitizeError(value, serverMode)
+              : value;
+          return ["SanitizedError", name, message, stack];
+        }
+
+        if (value instanceof ErrorResponseImpl) {
+          let { data, status, statusText } = value;
+          return ["ErrorResponse", data, status, statusText];
+        }
+
+        if (
+          value &&
+          typeof value === "object" &&
+          SingleFetchRedirectSymbol in value
+        ) {
+          return ["SingleFetchRedirect", value[SingleFetchRedirectSymbol]];
+        }
+      },
+    ],
+  });
+}

From e48752b3b003bfcdf40f89251ec90556b3bdc0c4 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Wed, 27 Mar 2024 12:57:23 -0400
Subject: [PATCH 039/108] Syn up lockfilem after peer deup updates

---
 package.json                |  2 +-
 scripts/patchup-version.mjs | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 61aede9cd91..8d563372985 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "vite-ecosystem-ci:before-test": "pnpm playwright install",
     "vite-ecosystem-ci:test": "pnpm playwright:integration --project=chromium integration/vite-* && pnpm clean:integration",
     "changeset": "changeset",
-    "changeset:version": "changeset version && node ./scripts/remove-prerelease-changelogs.mjs && node ./scripts/patchup-version.mjs",
+    "changeset:version": "changeset version && node ./scripts/remove-prerelease-changelogs.mjs && node ./scripts/patchup-version.mjs && pnpm install --no-frozen-lockfile",
     "changeset:release": "pnpm build --tsc && changeset publish",
     "version": "node ./scripts/version.js",
     "watch": "rollup -c --watch --watch.onEnd=\"node scripts/copy-build-to-dist.mjs\""
diff --git a/scripts/patchup-version.mjs b/scripts/patchup-version.mjs
index d33f8bfbd9e..db25a8969b5 100644
--- a/scripts/patchup-version.mjs
+++ b/scripts/patchup-version.mjs
@@ -1,4 +1,4 @@
-import { spawnSync } from "node:child_process";
+import { execSync, spawnSync } from "node:child_process";
 import * as fs from "node:fs";
 import path from "node:path";
 import * as url from "node:url";
@@ -7,12 +7,9 @@ import { getPackagesSync } from "@manypkg/get-packages";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 const rootDir = path.join(__dirname, "..");
 
-Promise.all([
-  writeRemixChangelog().then(() => console.log("✅ Wrote `remix` changelog")),
-  bumpPeerDepRanges().then(() =>
-    console.log("✅ Bumped peer dependency ranges")
-  ),
-]).then(() => console.log("---\n🎉 Done!"));
+Promise.all([writeRemixChangelog(), bumpPeerDepRanges()]).then(() =>
+  console.log("---\n🎉 Done!")
+);
 
 /**
  * Consider this scenario:
@@ -110,6 +107,13 @@ async function bumpPeerDepRanges() {
         "utf-8"
       );
     }
+
+    console.log("✅ Bumped peer dependency ranges");
+
+    execSync("pnpm install --no-frozen-lockfile");
+    console.log(
+      "✅ Synced up `pnpm-lock.yaml` via `pnpm install --no-frozen-lockfile`"
+    );
   }
 }
 
@@ -117,5 +121,6 @@ async function writeRemixChangelog() {
   let contents =
     "# `remix`\n\nSee the `CHANGELOG.md` in individual Remix packages for all changes.\n";
   let filePath = path.join(rootDir, "packages", "remix", "CHANGELOG.md");
-  return fs.promises.writeFile(filePath, contents, "utf-8");
+  await fs.promises.writeFile(filePath, contents, "utf-8");
+  console.log("✅ Wrote `remix` changelog");
 }

From fe4ad1b7081e19f34443efb3f664c686fec92fbf Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Wed, 27 Mar 2024 12:58:00 -0400
Subject: [PATCH 040/108] Enter prerelease mode

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

diff --git a/.changeset/pre.json b/.changeset/pre.json
new file mode 100644
index 00000000000..619a06195ab
--- /dev/null
+++ b/.changeset/pre.json
@@ -0,0 +1,29 @@
+{
+  "mode": "pre",
+  "tag": "pre",
+  "initialVersions": {
+    "integration": "0.0.0",
+    "integration-cf-template": "0.0.0",
+    "integration-deno-template": "0.0.0",
+    "integration-node-template": "0.0.0",
+    "integration-vite-cloudflare-template": "0.0.0",
+    "integration-vite-template": "0.0.0",
+    "create-remix": "2.8.1",
+    "remix": "2.8.1",
+    "@remix-run/architect": "2.8.1",
+    "@remix-run/cloudflare": "2.8.1",
+    "@remix-run/cloudflare-pages": "2.8.1",
+    "@remix-run/cloudflare-workers": "2.8.1",
+    "@remix-run/css-bundle": "2.8.1",
+    "@remix-run/deno": "2.8.1",
+    "@remix-run/dev": "2.8.1",
+    "@remix-run/eslint-config": "2.8.1",
+    "@remix-run/express": "2.8.1",
+    "@remix-run/node": "2.8.1",
+    "@remix-run/react": "2.8.1",
+    "@remix-run/serve": "2.8.1",
+    "@remix-run/server-runtime": "2.8.1",
+    "@remix-run/testing": "2.8.1"
+  },
+  "changesets": []
+}

From e3e440370e7570b16694f8df1adaec8b0f4eca09 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 27 Mar 2024 13:07:35 -0400
Subject: [PATCH 041/108] chore: Update version for release (pre) (#9150)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Matt Brophy <matt@brophy.org>
---
 .changeset/pre.json                           | 13 ++++++-
 .../vite-cloudflare-template/package.json     |  6 +--
 packages/create-remix/CHANGELOG.md            |  6 +++
 packages/create-remix/package.json            |  2 +-
 packages/remix-architect/CHANGELOG.md         |  7 ++++
 packages/remix-architect/package.json         |  2 +-
 packages/remix-cloudflare-pages/CHANGELOG.md  |  7 ++++
 packages/remix-cloudflare-pages/package.json  |  2 +-
 .../remix-cloudflare-workers/CHANGELOG.md     |  7 ++++
 .../remix-cloudflare-workers/package.json     |  2 +-
 packages/remix-cloudflare/CHANGELOG.md        |  7 ++++
 packages/remix-cloudflare/package.json        |  2 +-
 packages/remix-css-bundle/CHANGELOG.md        |  2 +
 packages/remix-css-bundle/package.json        |  2 +-
 packages/remix-deno/CHANGELOG.md              |  7 ++++
 packages/remix-deno/package.json              |  2 +-
 packages/remix-dev/CHANGELOG.md               | 24 ++++++++++++
 packages/remix-dev/package.json               |  6 +--
 packages/remix-eslint-config/CHANGELOG.md     |  2 +
 packages/remix-eslint-config/package.json     |  2 +-
 packages/remix-express/CHANGELOG.md           |  7 ++++
 packages/remix-express/package.json           |  2 +-
 packages/remix-node/CHANGELOG.md              | 11 ++++++
 packages/remix-node/package.json              |  2 +-
 packages/remix-react/CHANGELOG.md             | 20 ++++++++++
 packages/remix-react/package.json             |  2 +-
 packages/remix-serve/CHANGELOG.md             |  8 ++++
 packages/remix-serve/package.json             |  2 +-
 packages/remix-server-runtime/CHANGELOG.md    | 38 +++++++++++++++++++
 packages/remix-server-runtime/package.json    |  2 +-
 packages/remix-testing/CHANGELOG.md           | 19 ++++++++++
 packages/remix-testing/package.json           |  2 +-
 packages/remix/package.json                   |  2 +-
 pnpm-lock.yaml                                |  8 ++--
 scripts/patchup-version.mjs                   | 12 +++---
 35 files changed, 215 insertions(+), 32 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index 619a06195ab..aea6d1fea0d 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -25,5 +25,16 @@
     "@remix-run/server-runtime": "2.8.1",
     "@remix-run/testing": "2.8.1"
   },
-  "changesets": []
+  "changesets": [
+    "brave-cars-approve",
+    "curvy-seahorses-jog",
+    "heavy-steaks-remember",
+    "odd-frogs-attend",
+    "response-stub",
+    "shy-buttons-buy",
+    "single-fetch-client-loaders",
+    "single-fetch-spa-mode",
+    "single-fetch",
+    "spicy-ghosts-watch"
+  ]
 }
diff --git a/integration/helpers/vite-cloudflare-template/package.json b/integration/helpers/vite-cloudflare-template/package.json
index d58fbc2e552..9be24cd7fa6 100644
--- a/integration/helpers/vite-cloudflare-template/package.json
+++ b/integration/helpers/vite-cloudflare-template/package.json
@@ -11,9 +11,9 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/cloudflare": "*",
-    "@remix-run/cloudflare-pages": "*",
-    "@remix-run/react": "*",
+    "@remix-run/cloudflare": "2.9.0-pre.0",
+    "@remix-run/cloudflare-pages": "2.9.0-pre.0",
+    "@remix-run/react": "2.9.0-pre.0",
     "isbot": "^4.1.0",
     "miniflare": "^3.20231030.4",
     "react": "^18.2.0",
diff --git a/packages/create-remix/CHANGELOG.md b/packages/create-remix/CHANGELOG.md
index dabb0088233..c409a36bfef 100644
--- a/packages/create-remix/CHANGELOG.md
+++ b/packages/create-remix/CHANGELOG.md
@@ -1,5 +1,11 @@
 # `create-remix`
 
+## 2.9.0-pre.0
+
+### Patch Changes
+
+- Allow `.` in repo name when using `--template` flag ([#9026](https://github.com/remix-run/remix/pull/9026))
+
 ## 2.8.1
 
 No significant changes to this package were made in this release. [See the repo `CHANGELOG.md`](https://github.com/remix-run/remix/blob/main/CHANGELOG.md) for an overview of all changes in v2.8.1.
diff --git a/packages/create-remix/package.json b/packages/create-remix/package.json
index 61b36c4115e..1883e02b06f 100644
--- a/packages/create-remix/package.json
+++ b/packages/create-remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-remix",
-  "version": "2.8.1",
+  "version": "2.9.0-pre.0",
   "description": "Create a new Remix app",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix-architect/CHANGELOG.md b/packages/remix-architect/CHANGELOG.md
index 8f1290cf10e..77ea01f9c1f 100644
--- a/packages/remix-architect/CHANGELOG.md
+++ b/packages/remix-architect/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/architect`
 
+## 2.9.0-pre.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.0`
+
 ## 2.8.1
 
 ### Patch Changes
diff --git a/packages/remix-architect/package.json b/packages/remix-architect/package.json
index d2961e08ef6..e5f3806a43c 100644
--- a/packages/remix-architect/package.json
+++ b/packages/remix-architect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/architect",
-  "version": "2.8.1",
+  "version": "2.9.0-pre.0",
   "description": "Architect server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare-pages/CHANGELOG.md b/packages/remix-cloudflare-pages/CHANGELOG.md
index dde0cd3c2d5..bfe4e78cfb5 100644
--- a/packages/remix-cloudflare-pages/CHANGELOG.md
+++ b/packages/remix-cloudflare-pages/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-pages`
 
+## 2.9.0-pre.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/cloudflare@2.9.0-pre.0`
+
 ## 2.8.1
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare-pages/package.json b/packages/remix-cloudflare-pages/package.json
index 2155106a580..8aaefbcb59f 100644
--- a/packages/remix-cloudflare-pages/package.json
+++ b/packages/remix-cloudflare-pages/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-pages",
-  "version": "2.8.1",
+  "version": "2.9.0-pre.0",
   "description": "Cloudflare Pages request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare-workers/CHANGELOG.md b/packages/remix-cloudflare-workers/CHANGELOG.md
index 2e4ef755500..b97d2051465 100644
--- a/packages/remix-cloudflare-workers/CHANGELOG.md
+++ b/packages/remix-cloudflare-workers/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-workers`
 
+## 2.9.0-pre.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/cloudflare@2.9.0-pre.0`
+
 ## 2.8.1
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare-workers/package.json b/packages/remix-cloudflare-workers/package.json
index ec1df262a31..c54d8bdd8d5 100644
--- a/packages/remix-cloudflare-workers/package.json
+++ b/packages/remix-cloudflare-workers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-workers",
-  "version": "2.8.1",
+  "version": "2.9.0-pre.0",
   "description": "Cloudflare worker request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare/CHANGELOG.md b/packages/remix-cloudflare/CHANGELOG.md
index 31a23f93bde..1c58e93e980 100644
--- a/packages/remix-cloudflare/CHANGELOG.md
+++ b/packages/remix-cloudflare/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare`
 
+## 2.9.0-pre.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.0`
+
 ## 2.8.1
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare/package.json b/packages/remix-cloudflare/package.json
index c0e79a57537..1b4605976e4 100644
--- a/packages/remix-cloudflare/package.json
+++ b/packages/remix-cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare",
-  "version": "2.8.1",
+  "version": "2.9.0-pre.0",
   "description": "Cloudflare platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-css-bundle/CHANGELOG.md b/packages/remix-css-bundle/CHANGELOG.md
index d0ac6b99881..1a53d8db5fb 100644
--- a/packages/remix-css-bundle/CHANGELOG.md
+++ b/packages/remix-css-bundle/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @remix-run/css-bundle
 
+## 2.9.0-pre.0
+
 ## 2.8.1
 
 No significant changes to this package were made in this release. [See the repo `CHANGELOG.md`](https://github.com/remix-run/remix/blob/main/CHANGELOG.md) for an overview of all changes in v2.8.1.
diff --git a/packages/remix-css-bundle/package.json b/packages/remix-css-bundle/package.json
index db561c4312d..d90618bc1d2 100644
--- a/packages/remix-css-bundle/package.json
+++ b/packages/remix-css-bundle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/css-bundle",
-  "version": "2.8.1",
+  "version": "2.9.0-pre.0",
   "description": "CSS bundle href when using CSS bundling features in Remix",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix-deno/CHANGELOG.md b/packages/remix-deno/CHANGELOG.md
index 157fb89efff..23754c6a614 100644
--- a/packages/remix-deno/CHANGELOG.md
+++ b/packages/remix-deno/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/deno`
 
+## 2.9.0-pre.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.0`
+
 ## 2.8.1
 
 ### Patch Changes
diff --git a/packages/remix-deno/package.json b/packages/remix-deno/package.json
index 58d8739c38f..fd591f2110b 100644
--- a/packages/remix-deno/package.json
+++ b/packages/remix-deno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/deno",
-  "version": "2.8.1",
+  "version": "2.9.0-pre.0",
   "description": "Deno platform abstractions for Remix",
   "homepage": "https://remix.run",
   "main": "./index.ts",
diff --git a/packages/remix-dev/CHANGELOG.md b/packages/remix-dev/CHANGELOG.md
index e6c3670d426..6d323831ebd 100644
--- a/packages/remix-dev/CHANGELOG.md
+++ b/packages/remix-dev/CHANGELOG.md
@@ -1,5 +1,29 @@
 # `@remix-run/dev`
 
+## 2.9.0-pre.0
+
+### Minor Changes
+
+- New `future.unstable_singleFetch` flag ([#8773](https://github.com/remix-run/remix/pull/8773))
+
+  - Naked objects returned from loaders/actions are no longer automatically converted to JSON responses. They'll be streamed as-is via `turbo-stream` so `Date`'s will become `Date` through `useLoaderData()`
+  - You can return naked objects with `Promise`'s without needing to use `defer()` - including nested `Promise`'s
+    - If you need to return a custom status code or custom response headers, you can still use the `defer` utility
+  - `<RemixServer abortDelay>` is no longer used. Instead, you should `export const streamTimeout` from `entry.server.tsx` and the remix server runtime will use that as the delay to abort the streamed response
+    - If you export your own streamTimeout, you should decouple that from aborting the react `renderToPipeableStream`. You should always ensure that react is aborted _afer_ the stream is aborted so that abort rejections can be flushed down
+  - Actions no longer automatically revalidate on 4xx/5xx responses (via RR `future.unstable_skipActionErrorRevalidation` flag) - you can return a 2xx to opt-into revalidation or use `shouldRevalidate`
+
+### Patch Changes
+
+- Improve `getDependenciesToBundle` resolution in monorepos ([#8848](https://github.com/remix-run/remix/pull/8848))
+- Fix SPA mode when single fetch is enabled by using streaming entry.server ([#9063](https://github.com/remix-run/remix/pull/9063))
+- Vite: added sourcemap support for transformed routes ([#8970](https://github.com/remix-run/remix/pull/8970))
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.0`
+  - `@remix-run/server-runtime@2.9.0-pre.0`
+  - `@remix-run/react@2.9.0-pre.0`
+  - `@remix-run/serve@2.9.0-pre.0`
+
 ## 2.8.1
 
 ### Patch Changes
diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json
index 707f7da6ee9..3b6108b7cbf 100644
--- a/packages/remix-dev/package.json
+++ b/packages/remix-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/dev",
-  "version": "2.8.1",
+  "version": "2.9.0-pre.0",
   "description": "Dev tools and CLI for Remix",
   "homepage": "https://remix.run",
   "bugs": {
@@ -106,8 +106,8 @@
     "wrangler": "^3.28.2"
   },
   "peerDependencies": {
-    "@remix-run/react": "^2.8.1",
-    "@remix-run/serve": "^2.8.1",
+    "@remix-run/react": "^2.9.0-pre.0",
+    "@remix-run/serve": "^2.9.0-pre.0",
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2"
diff --git a/packages/remix-eslint-config/CHANGELOG.md b/packages/remix-eslint-config/CHANGELOG.md
index bee87fdb36c..622acdebbe6 100644
--- a/packages/remix-eslint-config/CHANGELOG.md
+++ b/packages/remix-eslint-config/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `@remix-run/eslint-config`
 
+## 2.9.0-pre.0
+
 ## 2.8.1
 
 No significant changes to this package were made in this release. [See the repo `CHANGELOG.md`](https://github.com/remix-run/remix/blob/main/CHANGELOG.md) for an overview of all changes in v2.8.1.
diff --git a/packages/remix-eslint-config/package.json b/packages/remix-eslint-config/package.json
index d2b0cbd1781..93b8b66d208 100644
--- a/packages/remix-eslint-config/package.json
+++ b/packages/remix-eslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/eslint-config",
-  "version": "2.8.1",
+  "version": "2.9.0-pre.0",
   "description": "ESLint configuration for Remix projects",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-express/CHANGELOG.md b/packages/remix-express/CHANGELOG.md
index 9fe93bd5643..14206febef6 100644
--- a/packages/remix-express/CHANGELOG.md
+++ b/packages/remix-express/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/express`
 
+## 2.9.0-pre.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.0`
+
 ## 2.8.1
 
 ### Patch Changes
diff --git a/packages/remix-express/package.json b/packages/remix-express/package.json
index eba15826ed3..fb5d49bcd40 100644
--- a/packages/remix-express/package.json
+++ b/packages/remix-express/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/express",
-  "version": "2.8.1",
+  "version": "2.9.0-pre.0",
   "description": "Express server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-node/CHANGELOG.md b/packages/remix-node/CHANGELOG.md
index f4165b929e3..311817f1c80 100644
--- a/packages/remix-node/CHANGELOG.md
+++ b/packages/remix-node/CHANGELOG.md
@@ -1,5 +1,16 @@
 # `@remix-run/node`
 
+## 2.9.0-pre.0
+
+### Minor Changes
+
+- Use undici as our fetch polyfill going forward. #9106 ([#9111](https://github.com/remix-run/remix/pull/9111))
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.0`
+
 ## 2.8.1
 
 ### Patch Changes
diff --git a/packages/remix-node/package.json b/packages/remix-node/package.json
index cf517ea7e75..9e5269fa1e7 100644
--- a/packages/remix-node/package.json
+++ b/packages/remix-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/node",
-  "version": "2.8.1",
+  "version": "2.9.0-pre.0",
   "description": "Node.js platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-react/CHANGELOG.md b/packages/remix-react/CHANGELOG.md
index f5fdf0ae911..3c67cb744fd 100644
--- a/packages/remix-react/CHANGELOG.md
+++ b/packages/remix-react/CHANGELOG.md
@@ -1,5 +1,25 @@
 # `@remix-run/react`
 
+## 2.9.0-pre.0
+
+### Minor Changes
+
+- New `future.unstable_singleFetch` flag ([#8773](https://github.com/remix-run/remix/pull/8773))
+
+  - Naked objects returned from loaders/actions are no longer automatically converted to JSON responses. They'll be streamed as-is via `turbo-stream` so `Date`'s will become `Date` through `useLoaderData()`
+  - You can return naked objects with `Promise`'s without needing to use `defer()` - including nested `Promise`'s
+    - If you need to return a custom status code or custom response headers, you can still use the `defer` utility
+  - `<RemixServer abortDelay>` is no longer used. Instead, you should `export const streamTimeout` from `entry.server.tsx` and the remix server runtime will use that as the delay to abort the streamed response
+    - If you export your own streamTimeout, you should decouple that from aborting the react `renderToPipeableStream`. You should always ensure that react is aborted _afer_ the stream is aborted so that abort rejections can be flushed down
+  - Actions no longer automatically revalidate on 4xx/5xx responses (via RR `future.unstable_skipActionErrorRevalidation` flag) - you can return a 2xx to opt-into revalidation or use `shouldRevalidate`
+
+### Patch Changes
+
+- fix: escape single fetch transfer ([#9084](https://github.com/remix-run/remix/pull/9084))
+- Update single fetch implementation to avoid over-fetching when clientLoader's exist ([#9073](https://github.com/remix-run/remix/pull/9073))
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.0`
+
 ## 2.8.1
 
 ### Patch Changes
diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json
index 09421915833..d3791bed0c5 100644
--- a/packages/remix-react/package.json
+++ b/packages/remix-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/react",
-  "version": "2.8.1",
+  "version": "2.9.0-pre.0",
   "description": "React DOM bindings for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-serve/CHANGELOG.md b/packages/remix-serve/CHANGELOG.md
index 745ae31e8f9..08edc9ff560 100644
--- a/packages/remix-serve/CHANGELOG.md
+++ b/packages/remix-serve/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/serve`
 
+## 2.9.0-pre.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.0`
+  - `@remix-run/express@2.9.0-pre.0`
+
 ## 2.8.1
 
 ### Patch Changes
diff --git a/packages/remix-serve/package.json b/packages/remix-serve/package.json
index 57842518bcf..7141443dcda 100644
--- a/packages/remix-serve/package.json
+++ b/packages/remix-serve/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/serve",
-  "version": "2.8.1",
+  "version": "2.9.0-pre.0",
   "description": "Production application server for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-server-runtime/CHANGELOG.md b/packages/remix-server-runtime/CHANGELOG.md
index 94a2b8d09d3..5a9a473e1c2 100644
--- a/packages/remix-server-runtime/CHANGELOG.md
+++ b/packages/remix-server-runtime/CHANGELOG.md
@@ -1,5 +1,43 @@
 # `@remix-run/server-runtime`
 
+## 2.9.0-pre.0
+
+### Minor Changes
+
+- New `future.unstable_singleFetch` flag ([#8773](https://github.com/remix-run/remix/pull/8773))
+
+  - Naked objects returned from loaders/actions are no longer automatically converted to JSON responses. They'll be streamed as-is via `turbo-stream` so `Date`'s will become `Date` through `useLoaderData()`
+  - You can return naked objects with `Promise`'s without needing to use `defer()` - including nested `Promise`'s
+    - If you need to return a custom status code or custom response headers, you can still use the `defer` utility
+  - `<RemixServer abortDelay>` is no longer used. Instead, you should `export const streamTimeout` from `entry.server.tsx` and the remix server runtime will use that as the delay to abort the streamed response
+    - If you export your own streamTimeout, you should decouple that from aborting the react `renderToPipeableStream`. You should always ensure that react is aborted _afer_ the stream is aborted so that abort rejections can be flushed down
+  - Actions no longer automatically revalidate on 4xx/5xx responses (via RR `future.unstable_skipActionErrorRevalidation` flag) - you can return a 2xx to opt-into revalidation or use `shouldRevalidate`
+
+### Patch Changes
+
+- handle net new redirects created by handleDataRequest ([#9104](https://github.com/remix-run/remix/pull/9104))
+- Add `ResponseStub` header interface for single fetch and deprecate the `headers` export ([#9142](https://github.com/remix-run/remix/pull/9142))
+
+  - The `headers` export is no longer used when single fetch is enabled
+  - `loader`/`action` functions now receive a mutable `response` parameter
+    - `type ResponseStub = { status: numbers | undefined, headers: Headers }`
+  - To alter the status of a response, set the `status` field directly
+    - `response.status = 201`
+  - To set headers on the Response, you may use:
+    - `response.headers.set`
+    - `response.headers.append`
+    - `response.headers.delete`
+  - Each `loader`/`action`receives it's own unique `response` instance so you cannot see what other `loader`/`action` functions have set (which would be subject to race conditions)
+  - If all status codes are unset or have values <200, the deepest status code will be used for the HTTP response
+  - If any status codes are set to a value >=300, the highest >=300 value will be used for the HTTP Response
+  - Remix tracks header operations and will replay them in order (action if present, then loaders top-down) after all handlers have completed on a fresh `Headers` instance that will be applied to the HTTP Response
+    - `headers.set` on any child handler will overwrite values from parent handlers
+    - `headers.append` can be used to set the same header from both a parent and child handler
+    - `headers.delete` can be used to delete a value set by a parent handler, but not a value set from a child handler
+  - Because single fetch supports naked object returns, and you no longer need to return a `Response` instance to set status/headers, the `json`/`redirect`/`redirectDocument`/`defer` utilities are considered deprecated when using Single Fetch
+  - You may still continue returning normal `Response` instances and they'll apply status codes in the same way, and will apply all headers via `headers.set` - overwriting any same-named header values from parents
+    - If you need to append, you will need to switch from returning a `Response` instance to using the new `response` parameter
+
 ## 2.8.1
 
 No significant changes to this package were made in this release. [See the repo `CHANGELOG.md`](https://github.com/remix-run/remix/blob/main/CHANGELOG.md) for an overview of all changes in v2.8.1.
diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json
index 182e319efa6..b0e6a751702 100644
--- a/packages/remix-server-runtime/package.json
+++ b/packages/remix-server-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/server-runtime",
-  "version": "2.8.1",
+  "version": "2.9.0-pre.0",
   "description": "Server runtime for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-testing/CHANGELOG.md b/packages/remix-testing/CHANGELOG.md
index e1b4c6d512b..49c28166b64 100644
--- a/packages/remix-testing/CHANGELOG.md
+++ b/packages/remix-testing/CHANGELOG.md
@@ -1,5 +1,24 @@
 # `@remix-run/testing`
 
+## 2.9.0-pre.0
+
+### Minor Changes
+
+- New `future.unstable_singleFetch` flag ([#8773](https://github.com/remix-run/remix/pull/8773))
+
+  - Naked objects returned from loaders/actions are no longer automatically converted to JSON responses. They'll be streamed as-is via `turbo-stream` so `Date`'s will become `Date` through `useLoaderData()`
+  - You can return naked objects with `Promise`'s without needing to use `defer()` - including nested `Promise`'s
+    - If you need to return a custom status code or custom response headers, you can still use the `defer` utility
+  - `<RemixServer abortDelay>` is no longer used. Instead, you should `export const streamTimeout` from `entry.server.tsx` and the remix server runtime will use that as the delay to abort the streamed response
+    - If you export your own streamTimeout, you should decouple that from aborting the react `renderToPipeableStream`. You should always ensure that react is aborted _afer_ the stream is aborted so that abort rejections can be flushed down
+  - Actions no longer automatically revalidate on 4xx/5xx responses (via RR `future.unstable_skipActionErrorRevalidation` flag) - you can return a 2xx to opt-into revalidation or use `shouldRevalidate`
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.0`
+  - `@remix-run/react@2.9.0-pre.0`
+
 ## 2.8.1
 
 ### Patch Changes
diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
index 2bac88cb046..4c561cf2115 100644
--- a/packages/remix-testing/package.json
+++ b/packages/remix-testing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/testing",
-  "version": "2.8.1",
+  "version": "2.9.0-pre.0",
   "description": "Testing utilities for Remix apps",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix/package.json b/packages/remix/package.json
index dff599351c2..65969d444c6 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "remix",
-  "version": "2.8.1",
+  "version": "2.9.0-pre.0",
   "description": "A framework for building better websites",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cffee17d109..ac2971a6f13 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -545,13 +545,13 @@ importers:
   integration/helpers/vite-cloudflare-template:
     dependencies:
       '@remix-run/cloudflare':
-        specifier: '*'
+        specifier: 2.9.0-pre.0
         version: link:../../../packages/remix-cloudflare
       '@remix-run/cloudflare-pages':
-        specifier: '*'
+        specifier: 2.9.0-pre.0
         version: link:../../../packages/remix-cloudflare-pages
       '@remix-run/react':
-        specifier: '*'
+        specifier: 2.9.0-pre.0
         version: link:../../../packages/remix-react
       isbot:
         specifier: ^4.1.0
@@ -865,7 +865,7 @@ importers:
         specifier: workspace:*
         version: link:../remix-node
       '@remix-run/react':
-        specifier: ^2.8.1
+        specifier: ^2.9.0-pre.0
         version: link:../remix-react
       '@remix-run/router':
         specifier: 1.16.0-pre.0
diff --git a/scripts/patchup-version.mjs b/scripts/patchup-version.mjs
index db25a8969b5..2bb9b91eecc 100644
--- a/scripts/patchup-version.mjs
+++ b/scripts/patchup-version.mjs
@@ -107,14 +107,14 @@ async function bumpPeerDepRanges() {
         "utf-8"
       );
     }
+  }
 
-    console.log("✅ Bumped peer dependency ranges");
+  console.log("✅ Bumped peer dependency ranges");
 
-    execSync("pnpm install --no-frozen-lockfile");
-    console.log(
-      "✅ Synced up `pnpm-lock.yaml` via `pnpm install --no-frozen-lockfile`"
-    );
-  }
+  execSync("pnpm install --no-frozen-lockfile");
+  console.log(
+    "✅ Synced up `pnpm-lock.yaml` via `pnpm install --no-frozen-lockfile`"
+  );
 }
 
 async function writeRemixChangelog() {

From ec253e12a07fcc881edc46d1f7f2cd3bb38b7e80 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Wed, 27 Mar 2024 17:06:57 -0400
Subject: [PATCH 042/108] Prep releasenotes

---
 CHANGELOG.md | 154 +++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 113 insertions(+), 41 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1f672af335..0cc3044f069 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,92 +13,100 @@ We manage release notes in this file instead of the paginated Github Releases Pa
   <summary>Table of Contents</summary>
 
 - [Remix Releases](#remix-releases)
-  - [v2.8.1](#v281)
+  - [v2.9.0](#v290)
+    - [What's Changed](#whats-changed)
+      - [Single Fetch (unstable)](#single-fetch-unstable)
+      - [Undici](#undici)
+    - [Minor Changes](#minor-changes)
     - [Patch Changes](#patch-changes)
     - [Updated Dependencies](#updated-dependencies)
     - [Changes by Package](#changes-by-package)
-  - [v2.8.0](#v280)
-    - [Minor Changes](#minor-changes)
+  - [v2.8.1](#v281)
     - [Patch Changes](#patch-changes-1)
     - [Updated Dependencies](#updated-dependencies-1)
     - [Changes by Package](#changes-by-package-1)
-  - [2.7.2](#272)
+  - [v2.8.0](#v280)
+    - [Minor Changes](#minor-changes-1)
     - [Patch Changes](#patch-changes-2)
-  - [2.7.1](#271)
+    - [Updated Dependencies](#updated-dependencies-2)
+    - [Changes by Package](#changes-by-package-2)
+  - [2.7.2](#272)
     - [Patch Changes](#patch-changes-3)
+  - [2.7.1](#271)
+    - [Patch Changes](#patch-changes-4)
   - [v2.7.0](#v270)
-    - [What's Changed](#whats-changed)
+    - [What's Changed](#whats-changed-1)
       - [Stabilized Vite Plugin](#stabilized-vite-plugin)
       - [New `Layout` Export](#new-layout-export)
       - [Basename support](#basename-support)
       - [Cloudflare Proxy as a Vite Plugin](#cloudflare-proxy-as-a-vite-plugin)
-    - [Minor Changes](#minor-changes-1)
-    - [Patch Changes](#patch-changes-4)
-    - [Updated Dependencies](#updated-dependencies-2)
-    - [Changes by Package](#changes-by-package-2)
-  - [v2.6.0](#v260)
-    - [What's Changed](#whats-changed-1)
-      - [Unstable Vite Plugin updates](#unstable-vite-plugin-updates)
     - [Minor Changes](#minor-changes-2)
     - [Patch Changes](#patch-changes-5)
     - [Updated Dependencies](#updated-dependencies-3)
     - [Changes by Package](#changes-by-package-3)
-  - [v2.5.1](#v251)
+  - [v2.6.0](#v260)
+    - [What's Changed](#whats-changed-2)
+      - [Unstable Vite Plugin updates](#unstable-vite-plugin-updates)
+    - [Minor Changes](#minor-changes-3)
     - [Patch Changes](#patch-changes-6)
     - [Updated Dependencies](#updated-dependencies-4)
     - [Changes by Package](#changes-by-package-4)
-  - [v2.5.0](#v250)
-    - [What's Changed](#whats-changed-2)
-      - [SPA Mode (unstable)](#spa-mode-unstable)
-      - [Server Bundles (unstable)](#server-bundles-unstable)
-    - [Minor Changes](#minor-changes-3)
+  - [v2.5.1](#v251)
     - [Patch Changes](#patch-changes-7)
     - [Updated Dependencies](#updated-dependencies-5)
     - [Changes by Package](#changes-by-package-5)
-  - [v2.4.1](#v241)
+  - [v2.5.0](#v250)
+    - [What's Changed](#whats-changed-3)
+      - [SPA Mode (unstable)](#spa-mode-unstable)
+      - [Server Bundles (unstable)](#server-bundles-unstable)
+    - [Minor Changes](#minor-changes-4)
     - [Patch Changes](#patch-changes-8)
     - [Updated Dependencies](#updated-dependencies-6)
     - [Changes by Package](#changes-by-package-6)
+  - [v2.4.1](#v241)
+    - [Patch Changes](#patch-changes-9)
+    - [Updated Dependencies](#updated-dependencies-7)
+    - [Changes by Package](#changes-by-package-7)
   - [v2.4.0](#v240)
-    - [What's Changed](#whats-changed-3)
+    - [What's Changed](#whats-changed-4)
       - [Client Data](#client-data)
       - [`future.v3_relativeSplatPath`](#futurev3_relativesplatpath)
       - [Vite Updates (Unstable)](#vite-updates-unstable)
-    - [Minor Changes](#minor-changes-4)
-    - [Patch Changes](#patch-changes-9)
-    - [Updated Dependencies](#updated-dependencies-7)
-    - [Changes by Package](#changes-by-package-7)
-  - [v2.3.1](#v231)
+    - [Minor Changes](#minor-changes-5)
     - [Patch Changes](#patch-changes-10)
     - [Updated Dependencies](#updated-dependencies-8)
     - [Changes by Package](#changes-by-package-8)
-  - [v2.3.0](#v230)
-    - [What's Changed](#whats-changed-4)
-      - [Stabilized `useBlocker`](#stabilized-useblocker)
-      - [`unstable_flushSync` API](#unstable_flushsync-api)
-    - [Minor Changes](#minor-changes-5)
+  - [v2.3.1](#v231)
     - [Patch Changes](#patch-changes-11)
     - [Updated Dependencies](#updated-dependencies-9)
     - [Changes by Package](#changes-by-package-9)
-  - [v2.2.0](#v220)
+  - [v2.3.0](#v230)
     - [What's Changed](#whats-changed-5)
-      - [Vite!](#vite)
-      - [New Fetcher APIs](#new-fetcher-apis)
-      - [Persistence Future Flag](#persistence-future-flag)
+      - [Stabilized `useBlocker`](#stabilized-useblocker)
+      - [`unstable_flushSync` API](#unstable_flushsync-api)
     - [Minor Changes](#minor-changes-6)
     - [Patch Changes](#patch-changes-12)
     - [Updated Dependencies](#updated-dependencies-10)
     - [Changes by Package](#changes-by-package-10)
-  - [v2.1.0](#v210)
+  - [v2.2.0](#v220)
     - [What's Changed](#whats-changed-6)
-      - [View Transitions](#view-transitions)
-      - [Stable `createRemixStub`](#stable-createremixstub)
+      - [Vite!](#vite)
+      - [New Fetcher APIs](#new-fetcher-apis)
+      - [Persistence Future Flag](#persistence-future-flag)
     - [Minor Changes](#minor-changes-7)
     - [Patch Changes](#patch-changes-13)
     - [Updated Dependencies](#updated-dependencies-11)
     - [Changes by Package](#changes-by-package-11)
-  - [v2.0.1](#v201)
+  - [v2.1.0](#v210)
+    - [What's Changed](#whats-changed-7)
+      - [View Transitions](#view-transitions)
+      - [Stable `createRemixStub`](#stable-createremixstub)
+    - [Minor Changes](#minor-changes-8)
     - [Patch Changes](#patch-changes-14)
+    - [Updated Dependencies](#updated-dependencies-12)
+    - [Changes by Package](#changes-by-package-12)
+  - [v2.0.1](#v201)
+    - [Patch Changes](#patch-changes-15)
     - [Changes by Package 🔗](#changes-by-package-)
   - [v2.0.0](#v200)
     - [Breaking Changes](#breaking-changes)
@@ -110,8 +118,8 @@ We manage release notes in this file instead of the paginated Github Releases Pa
         - [Breaking Type Changes](#breaking-type-changes)
     - [New Features](#new-features)
     - [Other Notable Changes](#other-notable-changes)
-    - [Updated Dependencies](#updated-dependencies-12)
-    - [Changes by Package](#changes-by-package-12)
+    - [Updated Dependencies](#updated-dependencies-13)
+    - [Changes by Package](#changes-by-package-13)
 
 </details>
 
@@ -159,6 +167,70 @@ Date: YYYY-MM-DD
 
 -->
 
+## v2.9.0
+
+Date: 2024-04-03
+
+### What's Changed
+
+#### Single Fetch (unstable)
+
+`2.9.0` introduces a `future.unstable_singleFetch` flag to enable to Single Fetch behavior ([RFC](https://github.com/remix-run/remix/discussions/7640)) in your Remix application. Please refer to the [docs](https://remix.run/docs/en/main/guides/single-fetch) for the full detail but the high-level changes to be aware of include:
+
+- Naked objects returned from `loader`/`action` functions are no longer automatically serialized to JSON responses
+  - Instead, they'll be streamed as-is via [`turbo-stream`](https://github.com/jacob-ebey/turbo-stream) which allows direct serialization of more complex types such as `Promise`, `Date`, `Map` instances, and more
+- The `headers` export is no longer used when Single Fetch is enabled in favor of a new `response` stub passed to your `loader`/`action` functions
+- The `json`/`defer`/`redirect` utilities are deprecated when using Single Fetch (but still work _mostly_ the same)
+- Actions no longer automatically revalidate on `4xx`/`5xx` responses - you can return a `2xx` to opt-into revalidation or use `shouldRevalidate`
+
+#### Undici
+
+Wih Remix `2.9.0`, we have switched the underlying [Web Fetch](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API) polyfills to use the [`undici`](https://github.com/nodejs/undici) package. This change has a few primary benefits:
+
+- It allows us to stop maintaining our own [web-std-io fork](https://github.com/remix-run/web-std-io)
+- It should bring us more in-line with spec compliance
+  - ⚠️ It is possible that some non-spec-compliant bugs in our fork will be fixed" wit this move, so beware of "breaking bug fixes" and keep an eye on any advanced fetch API interactions you're performing in your app
+- Because `undici` is the fetch implementation used by `node` internally, it should better prepare Remix apps to more smoothly drop the polyfill to use the built-in Node.js APIs on `node` 20+
+
+### Minor Changes
+
+- New `future.unstable_singleFetch` flag ([#8773](https://github.com/remix-run/remix/pull/8773), [#9073](https://github.com/remix-run/remix/pull/9073), [#9084](https://github.com/remix-run/remix/pull/9084))
+- `@remix-run/dev` - Improve `getDependenciesToBundle` resolution in monorepos ([#8848](https://github.com/remix-run/remix/pull/8848))
+- `@remix-run/dev` - Fix SPA mode when Single Fetch is enabled by using streaming `entry.server` ([#9063](https://github.com/remix-run/remix/pull/9063))
+- `@remix-run/dev` - Vite: added sourcemap support for transformed routes ([#8970](https://github.com/remix-run/remix/pull/8970))
+- `@remix-run/node` - Use [`undici`](https://github.com/nodejs/undici) as the fetch polyfill going forward instead of `@remix-run/web-*` ([#9106](https://github.com/remix-run/remix/pull/9106), [#9111](https://github.com/remix-run/remix/pull/9111))
+- `@remix-run/server-runtime` - Add `ResponseStub` header interface for Single Fetch and deprecate the `headers` export ([#9142](https://github.com/remix-run/remix/pull/9142))
+- `@remix-run/server-runtime` - Handle redirects created by `handleDataRequest` ([#9104](https://github.com/remix-run/remix/pull/9104))
+
+### Patch Changes
+
+- `create-remix` - Allow `.` in repo name when using `--template` flag ([#9026](https://github.com/remix-run/remix/pull/9026))
+
+### Updated Dependencies
+
+- [`react-router-dom@6.23.0`](https://github.com/remix-run/react-router/releases/tag/react-router%406.23.0)
+- [`@remix-run/router@1.16.0`](https://github.com/remix-run/react-router/blob/main/packages/router/CHANGELOG.md#1160)
+
+### Changes by Package
+
+- [`create-remix`](https://github.com/remix-run/remix/blob/remix%402.9.0/packages/create-remix/CHANGELOG.md#290)
+- [`@remix-run/architect`](https://github.com/remix-run/remix/blob/remix%402.9.0/packages/remix-architect/CHANGELOG.md#290)
+- [`@remix-run/cloudflare`](https://github.com/remix-run/remix/blob/remix%402.9.0/packages/remix-cloudflare/CHANGELOG.md#290)
+- [`@remix-run/cloudflare-pages`](https://github.com/remix-run/remix/blob/remix%402.9.0/packages/remix-cloudflare-pages/CHANGELOG.md#290)
+- [`@remix-run/cloudflare-workers`](https://github.com/remix-run/remix/blob/remix%402.9.0/packages/remix-cloudflare-workers/CHANGELOG.md#290)
+- [`@remix-run/css-bundle`](https://github.com/remix-run/remix/blob/remix%402.9.0/packages/remix-css-bundle/CHANGELOG.md#290)
+- [`@remix-run/deno`](https://github.com/remix-run/remix/blob/remix%402.9.0/packages/remix-deno/CHANGELOG.md#290)
+- [`@remix-run/dev`](https://github.com/remix-run/remix/blob/remix%402.9.0/packages/remix-dev/CHANGELOG.md#290)
+- [`@remix-run/eslint-config`](https://github.com/remix-run/remix/blob/remix%402.9.0/packages/remix-eslint-config/CHANGELOG.md#290)
+- [`@remix-run/express`](https://github.com/remix-run/remix/blob/remix%402.9.0/packages/remix-express/CHANGELOG.md#290)
+- [`@remix-run/node`](https://github.com/remix-run/remix/blob/remix%402.9.0/packages/remix-node/CHANGELOG.md#290)
+- [`@remix-run/react`](https://github.com/remix-run/remix/blob/remix%402.9.0/packages/remix-react/CHANGELOG.md#290)
+- [`@remix-run/serve`](https://github.com/remix-run/remix/blob/remix%402.9.0/packages/remix-serve/CHANGELOG.md#290)
+- [`@remix-run/server-runtime`](https://github.com/remix-run/remix/blob/remix%402.9.0/packages/remix-server-runtime/CHANGELOG.md#290)
+- [`@remix-run/testing`](https://github.com/remix-run/remix/blob/remix%402.9.0/packages/remix-testing/CHANGELOG.md#290)
+
+**Full Changelog**: [`v2.8.1...v2.9.0`](https://github.com/remix-run/remix/compare/remix@2.8.1...remix@2.9.0)
+
 ## v2.8.1
 
 Date: 2024-03-07

From 0dc1da28cd78404fc1d836296e514adeb7c78aca Mon Sep 17 00:00:00 2001
From: Mark Dalgleish <mark.john.dalgleish@gmail.com>
Date: Thu, 28 Mar 2024 14:06:44 +1100
Subject: [PATCH 043/108] Remove old Vite template (#9152)

---
 templates/vite/.eslintrc.cjs         |  83 ----------------
 templates/vite/.gitignore            |   5 -
 templates/vite/README.md             |  36 -------
 templates/vite/app/entry.client.tsx  |  18 ----
 templates/vite/app/entry.server.tsx  | 140 ---------------------------
 templates/vite/app/root.tsx          |  29 ------
 templates/vite/app/routes/_index.tsx |  41 --------
 templates/vite/package.json          |  39 --------
 templates/vite/public/favicon.ico    | Bin 16958 -> 0 bytes
 templates/vite/tsconfig.json         |  32 ------
 templates/vite/vite.config.ts        |  10 --
 11 files changed, 433 deletions(-)
 delete mode 100644 templates/vite/.eslintrc.cjs
 delete mode 100644 templates/vite/.gitignore
 delete mode 100644 templates/vite/README.md
 delete mode 100644 templates/vite/app/entry.client.tsx
 delete mode 100644 templates/vite/app/entry.server.tsx
 delete mode 100644 templates/vite/app/root.tsx
 delete mode 100644 templates/vite/app/routes/_index.tsx
 delete mode 100644 templates/vite/package.json
 delete mode 100644 templates/vite/public/favicon.ico
 delete mode 100644 templates/vite/tsconfig.json
 delete mode 100644 templates/vite/vite.config.ts

diff --git a/templates/vite/.eslintrc.cjs b/templates/vite/.eslintrc.cjs
deleted file mode 100644
index c3128a897c8..00000000000
--- a/templates/vite/.eslintrc.cjs
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * This is intended to be a basic starting point for linting in your app.
- * It relies on recommended configs out of the box for simplicity, but you can
- * and should modify this configuration to best suit your team's needs.
- */
-
-/** @type {import('eslint').Linter.Config} */
-module.exports = {
-  root: true,
-  parserOptions: {
-    ecmaVersion: "latest",
-    sourceType: "module",
-    ecmaFeatures: {
-      jsx: true,
-    },
-  },
-  env: {
-    browser: true,
-    commonjs: true,
-    es6: true,
-  },
-
-  // Base config
-  extends: ["eslint:recommended"],
-
-  overrides: [
-    // React
-    {
-      files: ["**/*.{js,jsx,ts,tsx}"],
-      plugins: ["react", "jsx-a11y"],
-      extends: [
-        "plugin:react/recommended",
-        "plugin:react/jsx-runtime",
-        "plugin:react-hooks/recommended",
-        "plugin:jsx-a11y/recommended",
-      ],
-      settings: {
-        react: {
-          version: "detect",
-        },
-        formComponents: ["Form"],
-        linkComponents: [
-          { name: "Link", linkAttribute: "to" },
-          { name: "NavLink", linkAttribute: "to" },
-        ],
-        "import/resolver": {
-          typescript: {},
-        },
-      },
-    },
-
-    // Typescript
-    {
-      files: ["**/*.{ts,tsx}"],
-      plugins: ["@typescript-eslint", "import"],
-      parser: "@typescript-eslint/parser",
-      settings: {
-        "import/internal-regex": "^~/",
-        "import/resolver": {
-          node: {
-            extensions: [".ts", ".tsx"],
-          },
-          typescript: {
-            alwaysTryTypes: true,
-          },
-        },
-      },
-      extends: [
-        "plugin:@typescript-eslint/recommended",
-        "plugin:import/recommended",
-        "plugin:import/typescript",
-      ],
-    },
-
-    // Node
-    {
-      files: [".eslintrc.cjs"],
-      env: {
-        node: true,
-      },
-    },
-  ],
-};
diff --git a/templates/vite/.gitignore b/templates/vite/.gitignore
deleted file mode 100644
index 80ec311f4ff..00000000000
--- a/templates/vite/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-node_modules
-
-/.cache
-/build
-.env
diff --git a/templates/vite/README.md b/templates/vite/README.md
deleted file mode 100644
index c05e097d923..00000000000
--- a/templates/vite/README.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# Welcome to Remix + Vite!
-
-📖 See the [Remix docs](https://remix.run/docs) and the [Remix Vite docs](https://remix.run/docs/en/main/future/vite) for details on supported features.
-
-## Development
-
-Run the Vite dev server:
-
-```shellscript
-npm run dev
-```
-
-## Deployment
-
-First, build your app for production:
-
-```sh
-npm run build
-```
-
-Then run the app in production mode:
-
-```sh
-npm start
-```
-
-Now you'll need to pick a host to deploy it to.
-
-### DIY
-
-If you're familiar with deploying Node applications, the built-in Remix app server is production-ready.
-
-Make sure to deploy the output of `npm run build`
-
-- `build/server`
-- `build/client`
diff --git a/templates/vite/app/entry.client.tsx b/templates/vite/app/entry.client.tsx
deleted file mode 100644
index 94d5dc0de0f..00000000000
--- a/templates/vite/app/entry.client.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * By default, Remix will handle hydrating your app on the client for you.
- * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨
- * For more information, see https://remix.run/file-conventions/entry.client
- */
-
-import { RemixBrowser } from "@remix-run/react";
-import { startTransition, StrictMode } from "react";
-import { hydrateRoot } from "react-dom/client";
-
-startTransition(() => {
-  hydrateRoot(
-    document,
-    <StrictMode>
-      <RemixBrowser />
-    </StrictMode>
-  );
-});
diff --git a/templates/vite/app/entry.server.tsx b/templates/vite/app/entry.server.tsx
deleted file mode 100644
index 45db3229c68..00000000000
--- a/templates/vite/app/entry.server.tsx
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * By default, Remix will handle generating the HTTP Response for you.
- * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨
- * For more information, see https://remix.run/file-conventions/entry.server
- */
-
-import { PassThrough } from "node:stream";
-
-import type { AppLoadContext, EntryContext } from "@remix-run/node";
-import { createReadableStreamFromReadable } from "@remix-run/node";
-import { RemixServer } from "@remix-run/react";
-import { isbot } from "isbot";
-import { renderToPipeableStream } from "react-dom/server";
-
-const ABORT_DELAY = 5_000;
-
-export default function handleRequest(
-  request: Request,
-  responseStatusCode: number,
-  responseHeaders: Headers,
-  remixContext: EntryContext,
-  // This is ignored so we can keep it in the template for visibility.  Feel
-  // free to delete this parameter in your app if you're not using it!
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  loadContext: AppLoadContext
-) {
-  return isbot(request.headers.get("user-agent") || "")
-    ? handleBotRequest(
-        request,
-        responseStatusCode,
-        responseHeaders,
-        remixContext
-      )
-    : handleBrowserRequest(
-        request,
-        responseStatusCode,
-        responseHeaders,
-        remixContext
-      );
-}
-
-function handleBotRequest(
-  request: Request,
-  responseStatusCode: number,
-  responseHeaders: Headers,
-  remixContext: EntryContext
-) {
-  return new Promise((resolve, reject) => {
-    let shellRendered = false;
-    const { pipe, abort } = renderToPipeableStream(
-      <RemixServer
-        context={remixContext}
-        url={request.url}
-        abortDelay={ABORT_DELAY}
-      />,
-      {
-        onAllReady() {
-          shellRendered = true;
-          const body = new PassThrough();
-          const stream = createReadableStreamFromReadable(body);
-
-          responseHeaders.set("Content-Type", "text/html");
-
-          resolve(
-            new Response(stream, {
-              headers: responseHeaders,
-              status: responseStatusCode,
-            })
-          );
-
-          pipe(body);
-        },
-        onShellError(error: unknown) {
-          reject(error);
-        },
-        onError(error: unknown) {
-          responseStatusCode = 500;
-          // Log streaming rendering errors from inside the shell.  Don't log
-          // errors encountered during initial shell rendering since they'll
-          // reject and get logged in handleDocumentRequest.
-          if (shellRendered) {
-            console.error(error);
-          }
-        },
-      }
-    );
-
-    setTimeout(abort, ABORT_DELAY);
-  });
-}
-
-function handleBrowserRequest(
-  request: Request,
-  responseStatusCode: number,
-  responseHeaders: Headers,
-  remixContext: EntryContext
-) {
-  return new Promise((resolve, reject) => {
-    let shellRendered = false;
-    const { pipe, abort } = renderToPipeableStream(
-      <RemixServer
-        context={remixContext}
-        url={request.url}
-        abortDelay={ABORT_DELAY}
-      />,
-      {
-        onShellReady() {
-          shellRendered = true;
-          const body = new PassThrough();
-          const stream = createReadableStreamFromReadable(body);
-
-          responseHeaders.set("Content-Type", "text/html");
-
-          resolve(
-            new Response(stream, {
-              headers: responseHeaders,
-              status: responseStatusCode,
-            })
-          );
-
-          pipe(body);
-        },
-        onShellError(error: unknown) {
-          reject(error);
-        },
-        onError(error: unknown) {
-          responseStatusCode = 500;
-          // Log streaming rendering errors from inside the shell.  Don't log
-          // errors encountered during initial shell rendering since they'll
-          // reject and get logged in handleDocumentRequest.
-          if (shellRendered) {
-            console.error(error);
-          }
-        },
-      }
-    );
-
-    setTimeout(abort, ABORT_DELAY);
-  });
-}
diff --git a/templates/vite/app/root.tsx b/templates/vite/app/root.tsx
deleted file mode 100644
index e82f26fd179..00000000000
--- a/templates/vite/app/root.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import {
-  Links,
-  Meta,
-  Outlet,
-  Scripts,
-  ScrollRestoration,
-} from "@remix-run/react";
-
-export function Layout({ children }: { children: React.ReactNode }) {
-  return (
-    <html lang="en">
-      <head>
-        <meta charSet="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <Meta />
-        <Links />
-      </head>
-      <body>
-        {children}
-        <ScrollRestoration />
-        <Scripts />
-      </body>
-    </html>
-  );
-}
-
-export default function App() {
-  return <Outlet />;
-}
diff --git a/templates/vite/app/routes/_index.tsx b/templates/vite/app/routes/_index.tsx
deleted file mode 100644
index 5347369230e..00000000000
--- a/templates/vite/app/routes/_index.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import type { MetaFunction } from "@remix-run/node";
-
-export const meta: MetaFunction = () => {
-  return [
-    { title: "New Remix App" },
-    { name: "description", content: "Welcome to Remix!" },
-  ];
-};
-
-export default function Index() {
-  return (
-    <div style={{ fontFamily: "system-ui, sans-serif", lineHeight: "1.8" }}>
-      <h1>Welcome to Remix</h1>
-      <ul>
-        <li>
-          <a
-            target="_blank"
-            href="https://remix.run/tutorials/blog"
-            rel="noreferrer"
-          >
-            15m Quickstart Blog Tutorial
-          </a>
-        </li>
-        <li>
-          <a
-            target="_blank"
-            href="https://remix.run/tutorials/jokes"
-            rel="noreferrer"
-          >
-            Deep Dive Jokes App Tutorial
-          </a>
-        </li>
-        <li>
-          <a target="_blank" href="https://remix.run/docs" rel="noreferrer">
-            Remix Docs
-          </a>
-        </li>
-      </ul>
-    </div>
-  );
-}
diff --git a/templates/vite/package.json b/templates/vite/package.json
deleted file mode 100644
index ba824c84d9c..00000000000
--- a/templates/vite/package.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "private": true,
-  "sideEffects": false,
-  "type": "module",
-  "scripts": {
-    "build": "remix vite:build",
-    "dev": "remix vite:dev",
-    "lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
-    "start": "remix-serve ./build/server/index.js",
-    "typecheck": "tsc"
-  },
-  "dependencies": {
-    "@remix-run/node": "*",
-    "@remix-run/react": "*",
-    "@remix-run/serve": "*",
-    "isbot": "^4.1.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0"
-  },
-  "devDependencies": {
-    "@remix-run/dev": "*",
-    "@types/react": "^18.2.20",
-    "@types/react-dom": "^18.2.7",
-    "@typescript-eslint/eslint-plugin": "^6.7.4",
-    "@typescript-eslint/parser": "^6.7.4",
-    "eslint": "^8.38.0",
-    "eslint-import-resolver-typescript": "^3.6.1",
-    "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-jsx-a11y": "^6.7.1",
-    "eslint-plugin-react": "^7.33.2",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "typescript": "^5.1.6",
-    "vite": "^5.1.0",
-    "vite-tsconfig-paths": "^4.2.1"
-  },
-  "engines": {
-    "node": ">=18.0.0"
-  }
-}
diff --git a/templates/vite/public/favicon.ico b/templates/vite/public/favicon.ico
deleted file mode 100644
index 8830cf6821b354114848e6354889b8ecf6d2bc61..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16958
zcmeI3+jCXb9mnJN2h^uNlXH@jlam{_a8F3W{T}Wih>9YJpaf7TUbu)A5fv|h7OMfR
zR;q$lr&D!wv|c)`wcw1?>4QT1(&|jdsrI2h`Rn)dTW5t$8pz=s3_5L?#oBxAowe8R
z_WfPfN?F+@`q$D@rvC?(W!uWieppskmQ~YG*>*L?{img@tWpnYXZslxeh#TSUS3{q
z1Ju6JcfQSbQuORq69@YK(X-3c9vC2c2a2z~zw=F=50@pm0PUiCAm!bAT?2jpM`(^b
zC|2&Ngngt^<>oCv#<S!-dX;>?P(AZ`5_84x#QBPulix)TpkIAUp=(KgGo4CVS~Sxt
zVoR4>r5g9%bDh7hi0|v$={zr>CHd`?-l4^Ld(Z9PNz9piFY+llUw_x4ou7Vf-q%$g
z)&)J4>6Ft~RZ(uV>dJD<Ri@O+ttLaCvYPyTPWL>|`nxI1^x{X<kw8nThj+Y}tw{Or
zRjUv4hrU{KGhbGHm9Ho8JkC+BwU&#I{n0PFy7kVfbG?_+T+m-3nxQ?DUla7zinfMq
z%7#>@Z5S<=vf;V3w_(*O-7}W<=e$=}CB9_R;)m9)d7`d_xx+nl^Bg|%ew=?uoKO8w
zeQU7h;~8s!@9-k>7Cx}<bJ3N5)-UEEpLCvfc#RzR<`8{*xab{Oo3=4^71mT=VdDqW
z($=D$#(h&m+Q#bHD81KM6L?WCy3h+`$eLs0K9?!C`fS>1<o!{ao8ND$Pg}FkS7GCH
zJw}ah!*h61t2v#otd%vZ6+nN#?=TPYL0-^ar*$LiQFUQGZ9^+;N@Jx>SDQ7m(&miH
zs8!l*wOJ!GHbdh)pD--&W3+w`9YJ=;m^FtMY=`mTq8pyV!-@L6smwp3(q?G>=_4v^
zn(ikLue7!y70#2uhqUVpb7fp!=xu2{aM^1P^pts#+feZv8d~)2sf`sjXLQCEj;pdI
z%~f`JOO;*KnziMv^i_6+?mL?^wrE_&=IT9o1i!}Sd4Sx4O@w~1bi1)8<?^1W_hyQJ
z^TuRsvF7h=(){B?>(sXvYR-1?7~Zr<=SJ1Cw!i~yfi=4h6o3O~(-Sb2Ilwq%g$+V`
z>(C&N1!FV5rWF&iwt8~b)=jIn4b!XbrWrZgIHTISrdHcpjjx=TwJXI7_%Ks4oFLl9
zNT;!%!P4~xH85njXdfqgnIxIFOOKW`W$fxU%{{5wZkVF^G=JB$oUNU5dQSL&ZnR1s
z*ckJ$R`eCUJsWL>j6*+|2S1TL_J|Fl&kt=~XZF=+=iT0Xq1*KU-NuH%NAQff$LJp3
zU_*a;@7I0K{mqwux87~vwsp<}@P>KNDb}3U+6$rcZ114|QTMUSk+rhPA(b{$>pQTc
zIQri{+U>GMzsCy0Mo4BfWXJlkk;RhfpWpAB{=Rtr*d1MNC+H3Oi5+3D$gUI&AjV-1
z=0Z<L3zM*4u<g-e=|9$O^MnPHwN`w?DDl)WJ}-Op{;HO&ee}ljeagQt`n!MJWs7Ai
z;3B>Oox+bGyHe=yk-yu%=+{~&46C$ut^ZN+ysx$NH}*F43)3bKkMsxGyIl#>7Yb8W
zO{}&LUO8Ow{7>!bvSq?X{15&Y|4}0w2=o_^0ZzYgB+4HhZ4>s*mW&?RQ6&AY|CPcx
z$*LjftNS|H)ePYnIKNg{ck*|y7EJ&Co0ho0K`!{ENPkASeKy-JWE}dF_%}j)Z5a&q
zXAI2gPu6`s-@baW=*+keiE$A<b_MR?C-5PseqT8KkKDY(u92UZE4^yfJYZmLRl0Qj
z2mi$bu(VF|VOOk`m}JGAX2-zC@9eU}cdfT)cCWW1_iV7|_H3}{?+yJCT{HgFuJ!hW
z-dneDylkh+V;A%t9|&GGNe?DVALeWQ(D9>LIs5G6_X_6kgKK8n3jH2-H9`6bo)Qn1
zZ2x)xPt1=`9V|bE4*;j9$X20+xQCc$rEK<k`Fi~Hjq>|9OwH-O+Q*k`ZNw}K##SkY
z3u}aCV%V|j@!gL5(*5fuWo>JFjeU9Qqk`$bdwH8(qZovE2tA7WUpoCE=VKm^eZ|vZ
z(k<+j*mGJVah>8CkAsMD6#I$RtF;#57Wi`c_^k5?+KCmX$;Ky2*6<J=fcB~4B|ZV&
z?~?BCTu@_QfA&ei^lx3%=--_q{3EVljTZ#}J^n$D1~~>|Q^bJ8+s%2MB}OH-g$Ev^
zO3uqfGjuN%CZiu<`aCuKCh{kK!dDZ+<Fl~arF!o=>CcwgIeU2dsDfz+V>V3BDb~)~
zO!2l!_)m;ZepR~sL+-~s<YrF4FaR4!(myY+152d8&=KNvctHGLWgQw{tVX<yoWW_Z
zj-Hr!ndH7odVllGob8-nW3NBFv0(bY`1FL^9N&SL;FHHcq95!k&HtnS;-hG%hCy5j
z26`MMf5rEpW07<ly2*EzOXtyjasql9V^`87BWQ&$%XE#tlN;dgHVN~f{lTSm_O}mT
zE0})bgjJdY-h#`-)Z`P?PD;&z;T?03pC|DTyTxXaAF{>HS7;5ZB|~uUM&&5vDda2b
z)CW8S6GI*oF><|ZeY5D^+Mcsri)!tmrM33qvwI4r9o@(GlW!u2R>>sB|E#%W`c*@5
z|0iA|`{6aA7D4Q?vc1{vT-#yytn07`H!QIO^1+X7?zG3%y0<K~L$`F=p)E9B=Nsdp
zb=qM)|Jkjbc68S&dsX^=;-v%j)u|KbMf(>gPdIPUJ#s*DNAwd}m1_IMN1^T&be~+E
z_z%1W^9~dl|Me9U6+3oNyuMDkF*z_;dOG(Baa*yq;TRiw{EO~O_S6>e*L(+Cdu(TM
z@o%xTCV%hi&p)x3_inIF!b|W4|AF5p?y1j)cr9RG@v%QVaN8&LaorC-kJz_ExfVHB
za!mtuee#Vb?dh&bwrfGHYAiX&&|v$}U*UBM;#F!N=x>x|G5s0zOa9{(`=k4v^6iK3
z8d&=O@xhDs{;v7<i<J%blPl`%F2zV2g`fBkaG1Pogz882RUuz5)%QjDQ|qVROU;s)
z&2zMiK!4P)&yT-qFYjDtyBF5F{*y1vPxwCS6y&Rpe_)teF|v>JQ%eO;!Bt`&*MH&d
zp^K#dkq;jnJz%%bsqwlaKA5<gd^+Mkxi7IxDK-%BFT|4IAN4BoH1O}I%ID%*E>?fy
zS5JDbO#BgSAdi8<E3bcf{8u~%MEaSFm@4?cP}e`Oy}11ULi6hN?%l2f)C{Mn9*>NM
zDo2SifX6^Z;vn>cBh-?~r_n9qYvP|3ihrnqq6deS-#>l#dV4mX|G%L8|EL;$U+w69
z;rTK3FW$ewUfH|R-Z;3;jvpfiDm?Fvyu9PeR>wi|E8>&j2Z@2h`U}|$><c4e{h$1w
z{FfRq@#VNY57^%!w<Fg>2d`BPV3pz#ViIzH8v6pP^L-p!GbLv<;(p>}_6u&E6XO5-
zJ8JEvJ1)0>{iSd|kOQn#?0rTYL=KSmgMHCf$Qbm;7|8d(goD&T-~oCDuZf57iP#_Y
zmxaoOSjQsm*^u+m$L9AMqwi=6bpdiAY6k3akjGN{xOZ`_J<~Puyzpi7yhhKrLmXV;
z@ftONPy;Uw1F#{_fyGbk04yLE01v=i_5`RqQP+SUH0nb=O?l!J)qCSTdsbmjFJrTm
zx4^ef@qt{B+TV_OHOhtR?XT}1Etm(f21;#qyyW6FpnM+S7*M1iME?9fe8d-`Q#InN
z?^y{C_|8bxgUE@!o+Z72C)BrS&5D`gb-X8kq*1G7Uld-z19V}HY~mK#!o9MC-*#^+
znEsdc-|jj0+%cgBMy(cEkq4IQ1D*b;17Lyp>Utnsz%LRTfjQKL*vo(yJxwtw^)l|!
z7jhIDdtLB}m<l{aZcDUR3Vu-k+`XvA-r9dt!Sv$?zyM+)c*=UnSwkF9d<+EdBK`0Z
zOvSg<Db557lC(Q*`Yt{Kj07Xt>pkOIG&4@F+9cYkS5r%%jz}I0R#F4oBMf-|Jmmk*
zk^OEzF%}%5{a~kGYbFjV1n>HKC+a`;&-n*v_kD2DPP~n5(QE3C;30L<32GB*qV2z$
zWR1Kh=^1-q)P37WS6YWKlUSDe=eD^u_CV+P)q!3^{=$#b^auG<yDY{2eGgE&A8BtO
z4iN3=GdAq!6NGK#1^8e5z+BOTJyYw8ZN6Vq<F5*1vQvB~xg>S7m8zFfFS<>(e~)TG
z&uwWhSoetoe!1^<uYo6XVYh$jYq2>%)O}=6{SUcw-UQmw+i8lokRASPsbT=H|4D|(
zk^P7>TUEFho!3qXSWn$<jp767-aNC~whQ<7bkx~XU6anc7IYxL2j=)Mxg_x)9qvoF
z`x}FAA^ubCS9(wUhmE&MfARUmoSgHZc6;O0te<(<Bs#F)Ewf{<YvCDVx6mZtTa~xm
zriQQIAzi=kic!|RagNu)PQFvP&x`TjzqMDed4BN!oRJwP`eO||`2Qm5kC>m2{lHXw
zD>eN6-;wwq9(?@f^F4L2Ny5_6!d~iiA^s~(|B*lbZir-$&%)l>%Q(36yOIAu|326K
ztmBWz|MLA{Kj(H_{w2gd*nZ6a@ma(w==~EHIscEk|C=NGJa%Ruh4_+~f|%rt{I5v*
zIX@F?|KJID56-ivb+PLo(9hn_CdK{irOcL15>JNQFY112^$+}JPyI{uQ~$&E*=ri;
z`d^fH?4f=8vKHT4!p9O*fX(brB75Y9?e>T9=X#Fc@V#%@5^)~#zu5I(=>LQA-EGTS
zecy*#6gG+8lapch#Hh%vl(+}J;Q!hC1OKoo;#h3#V%5Js)tQ)|>pTT@1ojd+F9Gey
zg`B)zm`|Mo%tH31<UKv~=W{;tJ>s4=<+`Pu|B3orXwNyIcNN>;fBkIj^X8P}RXhF=
zXQK1u5RLN7k#_Q(KznJrALtMM13!vhfr025ar?@-%{l|uWt@NEd<$~n><jfS>RQL{
z+o;->n)+~0tt(u|o_9h!T`%M8%)w2awpV9b*xz9Pl-daUJm3y-HT%xg`^mFd6LBeL
z!0~s;zEr)Bn9x)I(wx`;JVwvRcc^io2XX(Nn3vr3dgbrr@YJ?K3w18P*52^ieBCQP
z=Up1V$N2~5ppJHRTeY8QfM(7Yv&RG7oWJAy<l59ZkqbHxP9b+_2e(SqeV4yuK)@1s
z%lQX#-VwqX^njWV_Q$z9&VW$+qSn=+HB*x>v?c3g(29)P)u;_o&w|&)HGDIinXT~p
z3;S|e$=&Tek9Wn!`cdY+d-w@o`37}x{(hl>ykB|%9yB$CGdIcl7Z?d&lJ%}QHck77
zJPR%C+s2w1_Dl_pxu6$Zi!`HmoD-%7OD@7%lKLL^Ixd9VlRSW*o&$^iQ2z+}hTgH)
z#91TO#+jH<`w4L}XWOt(`gqM*uTUcky`O(mEyU|4dJoy6*UZJ7%*}ajuos%~>&P2j
zk23f5<@GeV?(?`l=ih+D8t`d72xrUjv0wsg;%s1@*2p?TQ;n2$pV7h?_T%sL>iL@w
zZ{lmc<|B7!e&o!zs6RW+u8+aDyUdG>ZS(v&rT$QVymB7sEC@VsK1dg^3F@K90-wYB
zX!we79q<?(Wh~izEdPF0&->x`(6LA>F$~{{xE8-3Wzyfe`+Lsce(?uj{k@lb9<ViF
zY+O(5$+i4C_V5c{<+16E=ROu{Q$6GPT4S6q&{_K5u_V`@ycX##{0*QmV{dZ2nCqY;
zA?8S4GZ*)9&c3dbWAVLjyN70I=SO__U;F#l<Io(a5C3z2A@tzemRqUwLt}5+d-0(~
z@9;OFU}KNoe$TIui>7YTJt#>l*Z&LyKX@zjmu?UJC9w~;|NsB{%7G}y*uNDBxirfC
EKbET!0{{R3

diff --git a/templates/vite/tsconfig.json b/templates/vite/tsconfig.json
deleted file mode 100644
index 9d87dd378f5..00000000000
--- a/templates/vite/tsconfig.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "include": [
-    "**/*.ts",
-    "**/*.tsx",
-    "**/.server/**/*.ts",
-    "**/.server/**/*.tsx",
-    "**/.client/**/*.ts",
-    "**/.client/**/*.tsx"
-  ],
-  "compilerOptions": {
-    "lib": ["DOM", "DOM.Iterable", "ES2022"],
-    "types": ["@remix-run/node", "vite/client"],
-    "isolatedModules": true,
-    "esModuleInterop": true,
-    "jsx": "react-jsx",
-    "module": "ESNext",
-    "moduleResolution": "Bundler",
-    "resolveJsonModule": true,
-    "target": "ES2022",
-    "strict": true,
-    "allowJs": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "baseUrl": ".",
-    "paths": {
-      "~/*": ["./app/*"]
-    },
-
-    // Vite takes care of building everything, not tsc.
-    "noEmit": true
-  }
-}
diff --git a/templates/vite/vite.config.ts b/templates/vite/vite.config.ts
deleted file mode 100644
index 2b6aff98727..00000000000
--- a/templates/vite/vite.config.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { vitePlugin as remix } from "@remix-run/dev";
-import { installGlobals } from "@remix-run/node";
-import { defineConfig } from "vite";
-import tsconfigPaths from "vite-tsconfig-paths";
-
-installGlobals();
-
-export default defineConfig({
-  plugins: [remix(), tsconfigPaths()],
-});

From 54f7755728dc6c93d013f9967322114c68e2bb0e Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Fri, 29 Mar 2024 15:27:07 -0400
Subject: [PATCH 044/108] Remove text/x-turbo check from client side for use
 with SSG scenarios (#9162)

---
 .changeset/honest-geese-chew.md       |  5 +++++
 integration/error-boundary-v2-test.ts |  7 ++++++-
 packages/remix-react/single-fetch.tsx | 19 ++++++++++++-------
 3 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/honest-geese-chew.md

diff --git a/.changeset/honest-geese-chew.md b/.changeset/honest-geese-chew.md
new file mode 100644
index 00000000000..ea802b30d9d
--- /dev/null
+++ b/.changeset/honest-geese-chew.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/react": patch
+---
+
+[REMOVE] Loosen header check on turbo stream responses for SSG compatibility
diff --git a/integration/error-boundary-v2-test.ts b/integration/error-boundary-v2-test.ts
index 16014bc1fa4..3b4bab581c0 100644
--- a/integration/error-boundary-v2-test.ts
+++ b/integration/error-boundary-v2-test.ts
@@ -413,7 +413,12 @@ test.describe("single fetch", () => {
         let app = new PlaywrightFixture(appFixture, page);
         await app.goto("/parent");
         await app.clickLink("/parent/child-with-boundary");
-        await waitForAndAssert(page, app, "#child-error", "CDN Error!");
+        await waitForAndAssert(
+          page,
+          app,
+          "#child-error",
+          "Unable to decode turbo-stream response from URL"
+        );
       });
     });
 
diff --git a/packages/remix-react/single-fetch.tsx b/packages/remix-react/single-fetch.tsx
index 5824af92ba7..af2331c845e 100644
--- a/packages/remix-react/single-fetch.tsx
+++ b/packages/remix-react/single-fetch.tsx
@@ -282,16 +282,21 @@ export function singleFetchUrl(reqUrl: URL | string) {
 
 async function fetchAndDecode(url: URL, init?: RequestInit) {
   let res = await fetch(url, init);
-  if (res.headers.get("Content-Type")?.includes("text/x-turbo")) {
-    invariant(res.body, "No response body to decode");
+  // Don't do a hard check against the header here.  We'll get `text/x-turbo`
+  // when we have a running server, but if folks want to prerender `.data` files
+  // and serve them from a CDN we should let them come back with whatever
+  // Content-Type their CDN provides and not force them to make sure `.data`
+  // files are served as `text/x-turbo`.  We'll throw if we can't decode anyway.
+  invariant(res.body, "No response body to decode");
+  try {
     let decoded = await decodeViaTurboStream(res.body, window);
     return { status: res.status, data: decoded.value };
+  } catch (e) {
+    console.error(e);
+    throw new Error(
+      `Unable to decode turbo-stream response from URL: ${url.toString()}`
+    );
   }
-
-  // If we didn't get back a turbo-stream response, then we never reached the
-  // Remix server and likely this is a network error - just expose up the
-  // response body as an Error
-  throw new Error(await res.text());
 }
 
 // Note: If you change this function please change the corresponding

From 0b379f6bec3b32f5bb73d69fa190f0624adcaccc Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Fri, 29 Mar 2024 15:36:45 -0400
Subject: [PATCH 045/108] Simplify implementation (#9157)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sergio Xalambrí <hello@sergiodxa.com>
---
 .changeset/popular-adults-remain.md           |  5 ++
 integration/package.json                      |  2 +-
 packages/remix-dev/package.json               |  2 +-
 packages/remix-react/package.json             |  6 +--
 packages/remix-server-runtime/package.json    |  2 +-
 packages/remix-server-runtime/single-fetch.ts | 48 +++++++++++++-----
 packages/remix-testing/package.json           |  4 +-
 pnpm-lock.yaml                                | 50 +++++++++----------
 8 files changed, 74 insertions(+), 45 deletions(-)
 create mode 100644 .changeset/popular-adults-remain.md

diff --git a/.changeset/popular-adults-remain.md b/.changeset/popular-adults-remain.md
new file mode 100644
index 00000000000..939fe3a81ef
--- /dev/null
+++ b/.changeset/popular-adults-remain.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/server-runtime": patch
+---
+
+[REMOVE] Remove RR flags and implement via dataStrategy
diff --git a/integration/package.json b/integration/package.json
index cb20fec7e6d..a0a7f7e7aba 100644
--- a/integration/package.json
+++ b/integration/package.json
@@ -14,7 +14,7 @@
     "@remix-run/dev": "workspace:*",
     "@remix-run/express": "workspace:*",
     "@remix-run/node": "workspace:*",
-    "@remix-run/router": "1.16.0-pre.0",
+    "@remix-run/router": "1.16.0-pre.1",
     "@remix-run/server-runtime": "workspace:*",
     "@types/express": "^4.17.9",
     "@vanilla-extract/css": "^1.10.0",
diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json
index 3b6108b7cbf..259aa2b4191 100644
--- a/packages/remix-dev/package.json
+++ b/packages/remix-dev/package.json
@@ -32,7 +32,7 @@
     "@mdx-js/mdx": "^2.3.0",
     "@npmcli/package-json": "^4.0.1",
     "@remix-run/node": "workspace:*",
-    "@remix-run/router": "1.16.0-pre.0",
+    "@remix-run/router": "1.16.0-pre.1",
     "@remix-run/server-runtime": "workspace:*",
     "@types/mdx": "^2.0.5",
     "@vanilla-extract/integration": "^6.2.0",
diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json
index d3791bed0c5..ada886683d7 100644
--- a/packages/remix-react/package.json
+++ b/packages/remix-react/package.json
@@ -19,10 +19,10 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@remix-run/router": "1.16.0-pre.0",
+    "@remix-run/router": "1.16.0-pre.1",
     "@remix-run/server-runtime": "workspace:*",
-    "react-router": "6.23.0-pre.0",
-    "react-router-dom": "6.23.0-pre.0",
+    "react-router": "6.23.0-pre.1",
+    "react-router-dom": "6.23.0-pre.1",
     "turbo-stream": "^2.0.0"
   },
   "devDependencies": {
diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json
index b0e6a751702..c312d28ca08 100644
--- a/packages/remix-server-runtime/package.json
+++ b/packages/remix-server-runtime/package.json
@@ -19,7 +19,7 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@remix-run/router": "1.16.0-pre.0",
+    "@remix-run/router": "1.16.0-pre.1",
     "@types/cookie": "^0.6.0",
     "@web3-storage/multipart-parser": "^1.0.0",
     "cookie": "^0.6.0",
diff --git a/packages/remix-server-runtime/single-fetch.ts b/packages/remix-server-runtime/single-fetch.ts
index 2d983b6fd46..c8e05e5a811 100644
--- a/packages/remix-server-runtime/single-fetch.ts
+++ b/packages/remix-server-runtime/single-fetch.ts
@@ -36,9 +36,22 @@ export type SingleFetchResults = {
 };
 
 export function getSingleFetchDataStrategy(
-  responseStubs: ReturnType<typeof getResponseStubs>
+  responseStubs: ReturnType<typeof getResponseStubs>,
+  {
+    isActionDataRequest,
+    loadRouteIds,
+  }: { isActionDataRequest?: boolean; loadRouteIds?: string[] } = {}
 ) {
   return async ({ request, matches }: DataStrategyFunctionArgs) => {
+    // Don't call loaders on action data requests
+    if (isActionDataRequest && request.method === "GET") {
+      return await Promise.all(
+        matches.map((m) =>
+          m.resolve(async () => ({ type: "data", result: null }))
+        )
+      );
+    }
+
     let results = await Promise.all(
       matches.map(async (match) => {
         let responseStub: ResponseStub | undefined;
@@ -49,7 +62,11 @@ export function getSingleFetchDataStrategy(
         }
 
         let result = await match.resolve(async (handler) => {
-          let data = await handler({ response: responseStub });
+          // Only run opt-in loaders when fine-grained revalidation is enabled
+          let data =
+            loadRouteIds && !loadRouteIds.includes(match.route.id)
+              ? null
+              : await handler({ response: responseStub });
           return { type: "data", result: data };
         });
 
@@ -96,8 +113,9 @@ export async function singleFetchAction(
     let result = await staticHandler.query(handlerRequest, {
       requestContext: loadContext,
       skipLoaderErrorBubbling: true,
-      skipLoaders: true,
-      unstable_dataStrategy: getSingleFetchDataStrategy(responseStubs),
+      unstable_dataStrategy: getSingleFetchDataStrategy(responseStubs, {
+        isActionDataRequest: true,
+      }),
     });
 
     // Unlike `handleDataRequest`, when singleFetch is enabled, queryRoute does
@@ -113,7 +131,9 @@ export async function singleFetchAction(
     let context = result;
 
     let singleFetchResult: SingleFetchResult;
-    let { statusCode, headers } = mergeResponseStubs(context, responseStubs);
+    let { statusCode, headers } = mergeResponseStubs(context, responseStubs, {
+      isActionDataRequest: true,
+    });
 
     if (isRedirectStatusCode(statusCode) && headers.has("Location")) {
       return {
@@ -176,9 +196,10 @@ export async function singleFetchLoaders(
     let responseStubs = getResponseStubs();
     let result = await staticHandler.query(handlerRequest, {
       requestContext: loadContext,
-      loadRouteIds,
       skipLoaderErrorBubbling: true,
-      unstable_dataStrategy: getSingleFetchDataStrategy(responseStubs),
+      unstable_dataStrategy: getSingleFetchDataStrategy(responseStubs, {
+        loadRouteIds,
+      }),
     });
 
     if (isResponse(result)) {
@@ -323,17 +344,20 @@ function proxyResponseToResponseStub(
 
 export function mergeResponseStubs(
   context: StaticHandlerContext,
-  responseStubs: ReturnType<typeof getResponseStubs>
+  responseStubs: ReturnType<typeof getResponseStubs>,
+  { isActionDataRequest }: { isActionDataRequest?: boolean } = {}
 ) {
   let statusCode: number | undefined = undefined;
   let headers = new Headers();
 
   // Action followed by top-down loaders
   let actionStub = responseStubs[ResponseStubActionSymbol];
-  let stubs = [
-    actionStub,
-    ...context.matches.map((m) => responseStubs[m.route.id]),
-  ];
+  let stubs = [actionStub];
+
+  // Nothing to merge at the route level on action data requests
+  if (!isActionDataRequest) {
+    stubs.push(...context.matches.map((m) => responseStubs[m.route.id]));
+  }
 
   for (let stub of stubs) {
     // Take the highest error/redirect, or the lowest success value - preferring
diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
index 4c561cf2115..7d253647247 100644
--- a/packages/remix-testing/package.json
+++ b/packages/remix-testing/package.json
@@ -21,8 +21,8 @@
   "dependencies": {
     "@remix-run/node": "workspace:*",
     "@remix-run/react": "workspace:*",
-    "@remix-run/router": "1.16.0-pre.0",
-    "react-router-dom": "6.23.0-pre.0"
+    "@remix-run/router": "1.16.0-pre.1",
+    "react-router-dom": "6.23.0-pre.1"
   },
   "devDependencies": {
     "@remix-run/server-runtime": "workspace:*",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ac2971a6f13..e620a9438e2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -320,8 +320,8 @@ importers:
         specifier: workspace:*
         version: link:../packages/remix-node
       '@remix-run/router':
-        specifier: 1.16.0-pre.0
-        version: 1.16.0-pre.0
+        specifier: 1.16.0-pre.1
+        version: 1.16.0-pre.1
       '@remix-run/server-runtime':
         specifier: workspace:*
         version: link:../packages/remix-server-runtime
@@ -868,8 +868,8 @@ importers:
         specifier: ^2.9.0-pre.0
         version: link:../remix-react
       '@remix-run/router':
-        specifier: 1.16.0-pre.0
-        version: 1.16.0-pre.0
+        specifier: 1.16.0-pre.1
+        version: 1.16.0-pre.1
       '@remix-run/server-runtime':
         specifier: workspace:*
         version: link:../remix-server-runtime
@@ -1211,17 +1211,17 @@ importers:
   packages/remix-react:
     dependencies:
       '@remix-run/router':
-        specifier: 1.16.0-pre.0
-        version: 1.16.0-pre.0
+        specifier: 1.16.0-pre.1
+        version: 1.16.0-pre.1
       '@remix-run/server-runtime':
         specifier: workspace:*
         version: link:../remix-server-runtime
       react-router:
-        specifier: 6.23.0-pre.0
-        version: 6.23.0-pre.0(react@18.2.0)
+        specifier: 6.23.0-pre.1
+        version: 6.23.0-pre.1(react@18.2.0)
       react-router-dom:
-        specifier: 6.23.0-pre.0
-        version: 6.23.0-pre.0(react-dom@18.2.0)(react@18.2.0)
+        specifier: 6.23.0-pre.1
+        version: 6.23.0-pre.1(react-dom@18.2.0)(react@18.2.0)
       turbo-stream:
         specifier: ^2.0.0
         version: 2.0.0
@@ -1297,8 +1297,8 @@ importers:
   packages/remix-server-runtime:
     dependencies:
       '@remix-run/router':
-        specifier: 1.16.0-pre.0
-        version: 1.16.0-pre.0
+        specifier: 1.16.0-pre.1
+        version: 1.16.0-pre.1
       '@types/cookie':
         specifier: ^0.6.0
         version: 0.6.0
@@ -1334,11 +1334,11 @@ importers:
         specifier: workspace:*
         version: link:../remix-react
       '@remix-run/router':
-        specifier: 1.16.0-pre.0
-        version: 1.16.0-pre.0
+        specifier: 1.16.0-pre.1
+        version: 1.16.0-pre.1
       react-router-dom:
-        specifier: 6.23.0-pre.0
-        version: 6.23.0-pre.0(react-dom@18.2.0)(react@18.2.0)
+        specifier: 6.23.0-pre.1
+        version: 6.23.0-pre.1(react-dom@18.2.0)(react@18.2.0)
     devDependencies:
       '@remix-run/server-runtime':
         specifier: workspace:*
@@ -4193,8 +4193,8 @@ packages:
       - encoding
     dev: false
 
-  /@remix-run/router@1.16.0-pre.0:
-    resolution: {integrity: sha512-4KYbcmBcjX1HO/sLPZIcY87YWTF3e5qs9KTTieXE0HNukV2m199yTkMIjcmzTNL6w0wDj5YYc2YiXxm4W9qsTw==}
+  /@remix-run/router@1.16.0-pre.1:
+    resolution: {integrity: sha512-zmaT9ICBPTMyoerhGgydSZVdBbEysM7SHan4pJUBIPe66ofscEv60OCjPyX+ZcH2ihjspj3tN2/ZnYAIZmEzjA==}
     engines: {node: '>=14.0.0'}
     dev: false
 
@@ -12784,26 +12784,26 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: false
 
-  /react-router-dom@6.23.0-pre.0(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-TDEljjV6XwOEb9gp6FFNquAB0yY490lhSZRo4YNDPI8+QEA0n3yJ2VfIZLmxR70ljnFBwYOnWmNl94EHom/JjQ==}
+  /react-router-dom@6.23.0-pre.1(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-iZnPPBGCvg/gGzzKCqaXoPJjdVQwjJ4aJj2UTatJvzIQq6c586BS7u8WzpHy2pmbri58btGj4eLIgF7jv1Fgvw==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
       react: '>=16.8'
       react-dom: '>=16.8'
     dependencies:
-      '@remix-run/router': 1.16.0-pre.0
+      '@remix-run/router': 1.16.0-pre.1
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      react-router: 6.23.0-pre.0(react@18.2.0)
+      react-router: 6.23.0-pre.1(react@18.2.0)
     dev: false
 
-  /react-router@6.23.0-pre.0(react@18.2.0):
-    resolution: {integrity: sha512-GawzByLrAoOr4Sc0ybAuYBTJmtysK8I7p3VuBQCzDCqXzu10uAP7tu0Iy+mv0SGkmzKpPXg4PUO26UQ9bBH7bg==}
+  /react-router@6.23.0-pre.1(react@18.2.0):
+    resolution: {integrity: sha512-lijdeB51mv3Cxij+ymI/NcGCb0D9KjXPuvqFXxeUIyMtevHh6i1viDD/0U+gknla1ZfawhWKfwkn4XAD2T7KTA==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
       react: '>=16.8'
     dependencies:
-      '@remix-run/router': 1.16.0-pre.0
+      '@remix-run/router': 1.16.0-pre.1
       react: 18.2.0
     dev: false
 

From acbb9675984da7c650f82c1539dda1a1a9af24b4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2024 15:38:48 -0400
Subject: [PATCH 046/108] chore: Update version for release (pre) (#9164)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json                                       | 2 ++
 integration/helpers/vite-cloudflare-template/package.json | 6 +++---
 packages/create-remix/CHANGELOG.md                        | 2 ++
 packages/create-remix/package.json                        | 2 +-
 packages/remix-architect/CHANGELOG.md                     | 7 +++++++
 packages/remix-architect/package.json                     | 2 +-
 packages/remix-cloudflare-pages/CHANGELOG.md              | 7 +++++++
 packages/remix-cloudflare-pages/package.json              | 2 +-
 packages/remix-cloudflare-workers/CHANGELOG.md            | 7 +++++++
 packages/remix-cloudflare-workers/package.json            | 2 +-
 packages/remix-cloudflare/CHANGELOG.md                    | 7 +++++++
 packages/remix-cloudflare/package.json                    | 2 +-
 packages/remix-css-bundle/CHANGELOG.md                    | 2 ++
 packages/remix-css-bundle/package.json                    | 2 +-
 packages/remix-deno/CHANGELOG.md                          | 7 +++++++
 packages/remix-deno/package.json                          | 2 +-
 packages/remix-dev/CHANGELOG.md                           | 8 ++++++++
 packages/remix-dev/package.json                           | 6 +++---
 packages/remix-eslint-config/CHANGELOG.md                 | 2 ++
 packages/remix-eslint-config/package.json                 | 2 +-
 packages/remix-express/CHANGELOG.md                       | 7 +++++++
 packages/remix-express/package.json                       | 2 +-
 packages/remix-node/CHANGELOG.md                          | 7 +++++++
 packages/remix-node/package.json                          | 2 +-
 packages/remix-react/CHANGELOG.md                         | 8 ++++++++
 packages/remix-react/package.json                         | 2 +-
 packages/remix-serve/CHANGELOG.md                         | 8 ++++++++
 packages/remix-serve/package.json                         | 2 +-
 packages/remix-server-runtime/CHANGELOG.md                | 6 ++++++
 packages/remix-server-runtime/package.json                | 2 +-
 packages/remix-testing/CHANGELOG.md                       | 8 ++++++++
 packages/remix-testing/package.json                       | 2 +-
 packages/remix/package.json                               | 2 +-
 pnpm-lock.yaml                                            | 8 ++++----
 34 files changed, 120 insertions(+), 25 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index aea6d1fea0d..89230eb7162 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -29,7 +29,9 @@
     "brave-cars-approve",
     "curvy-seahorses-jog",
     "heavy-steaks-remember",
+    "honest-geese-chew",
     "odd-frogs-attend",
+    "popular-adults-remain",
     "response-stub",
     "shy-buttons-buy",
     "single-fetch-client-loaders",
diff --git a/integration/helpers/vite-cloudflare-template/package.json b/integration/helpers/vite-cloudflare-template/package.json
index 9be24cd7fa6..1e676c59190 100644
--- a/integration/helpers/vite-cloudflare-template/package.json
+++ b/integration/helpers/vite-cloudflare-template/package.json
@@ -11,9 +11,9 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/cloudflare": "2.9.0-pre.0",
-    "@remix-run/cloudflare-pages": "2.9.0-pre.0",
-    "@remix-run/react": "2.9.0-pre.0",
+    "@remix-run/cloudflare": "2.9.0-pre.1",
+    "@remix-run/cloudflare-pages": "2.9.0-pre.1",
+    "@remix-run/react": "2.9.0-pre.1",
     "isbot": "^4.1.0",
     "miniflare": "^3.20231030.4",
     "react": "^18.2.0",
diff --git a/packages/create-remix/CHANGELOG.md b/packages/create-remix/CHANGELOG.md
index c409a36bfef..0c39d33b073 100644
--- a/packages/create-remix/CHANGELOG.md
+++ b/packages/create-remix/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `create-remix`
 
+## 2.9.0-pre.1
+
 ## 2.9.0-pre.0
 
 ### Patch Changes
diff --git a/packages/create-remix/package.json b/packages/create-remix/package.json
index 1883e02b06f..5dc3caac4ec 100644
--- a/packages/create-remix/package.json
+++ b/packages/create-remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-remix",
-  "version": "2.9.0-pre.0",
+  "version": "2.9.0-pre.1",
   "description": "Create a new Remix app",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix-architect/CHANGELOG.md b/packages/remix-architect/CHANGELOG.md
index 77ea01f9c1f..bfb761cc1fd 100644
--- a/packages/remix-architect/CHANGELOG.md
+++ b/packages/remix-architect/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/architect`
 
+## 2.9.0-pre.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.1`
+
 ## 2.9.0-pre.0
 
 ### Patch Changes
diff --git a/packages/remix-architect/package.json b/packages/remix-architect/package.json
index e5f3806a43c..5feb8b2685f 100644
--- a/packages/remix-architect/package.json
+++ b/packages/remix-architect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/architect",
-  "version": "2.9.0-pre.0",
+  "version": "2.9.0-pre.1",
   "description": "Architect server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare-pages/CHANGELOG.md b/packages/remix-cloudflare-pages/CHANGELOG.md
index bfe4e78cfb5..dc490abde4c 100644
--- a/packages/remix-cloudflare-pages/CHANGELOG.md
+++ b/packages/remix-cloudflare-pages/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-pages`
 
+## 2.9.0-pre.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/cloudflare@2.9.0-pre.1`
+
 ## 2.9.0-pre.0
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare-pages/package.json b/packages/remix-cloudflare-pages/package.json
index 8aaefbcb59f..bc99135e88d 100644
--- a/packages/remix-cloudflare-pages/package.json
+++ b/packages/remix-cloudflare-pages/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-pages",
-  "version": "2.9.0-pre.0",
+  "version": "2.9.0-pre.1",
   "description": "Cloudflare Pages request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare-workers/CHANGELOG.md b/packages/remix-cloudflare-workers/CHANGELOG.md
index b97d2051465..c62e219c3b5 100644
--- a/packages/remix-cloudflare-workers/CHANGELOG.md
+++ b/packages/remix-cloudflare-workers/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-workers`
 
+## 2.9.0-pre.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/cloudflare@2.9.0-pre.1`
+
 ## 2.9.0-pre.0
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare-workers/package.json b/packages/remix-cloudflare-workers/package.json
index c54d8bdd8d5..afb81f8abe2 100644
--- a/packages/remix-cloudflare-workers/package.json
+++ b/packages/remix-cloudflare-workers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-workers",
-  "version": "2.9.0-pre.0",
+  "version": "2.9.0-pre.1",
   "description": "Cloudflare worker request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare/CHANGELOG.md b/packages/remix-cloudflare/CHANGELOG.md
index 1c58e93e980..bc266d91d14 100644
--- a/packages/remix-cloudflare/CHANGELOG.md
+++ b/packages/remix-cloudflare/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare`
 
+## 2.9.0-pre.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.1`
+
 ## 2.9.0-pre.0
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare/package.json b/packages/remix-cloudflare/package.json
index 1b4605976e4..84310e453a9 100644
--- a/packages/remix-cloudflare/package.json
+++ b/packages/remix-cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare",
-  "version": "2.9.0-pre.0",
+  "version": "2.9.0-pre.1",
   "description": "Cloudflare platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-css-bundle/CHANGELOG.md b/packages/remix-css-bundle/CHANGELOG.md
index 1a53d8db5fb..d02bd87d01e 100644
--- a/packages/remix-css-bundle/CHANGELOG.md
+++ b/packages/remix-css-bundle/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @remix-run/css-bundle
 
+## 2.9.0-pre.1
+
 ## 2.9.0-pre.0
 
 ## 2.8.1
diff --git a/packages/remix-css-bundle/package.json b/packages/remix-css-bundle/package.json
index d90618bc1d2..70dfbb44d97 100644
--- a/packages/remix-css-bundle/package.json
+++ b/packages/remix-css-bundle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/css-bundle",
-  "version": "2.9.0-pre.0",
+  "version": "2.9.0-pre.1",
   "description": "CSS bundle href when using CSS bundling features in Remix",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix-deno/CHANGELOG.md b/packages/remix-deno/CHANGELOG.md
index 23754c6a614..341c9a5f3fa 100644
--- a/packages/remix-deno/CHANGELOG.md
+++ b/packages/remix-deno/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/deno`
 
+## 2.9.0-pre.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.1`
+
 ## 2.9.0-pre.0
 
 ### Patch Changes
diff --git a/packages/remix-deno/package.json b/packages/remix-deno/package.json
index fd591f2110b..c35db368ed6 100644
--- a/packages/remix-deno/package.json
+++ b/packages/remix-deno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/deno",
-  "version": "2.9.0-pre.0",
+  "version": "2.9.0-pre.1",
   "description": "Deno platform abstractions for Remix",
   "homepage": "https://remix.run",
   "main": "./index.ts",
diff --git a/packages/remix-dev/CHANGELOG.md b/packages/remix-dev/CHANGELOG.md
index 6d323831ebd..fbd441ae9be 100644
--- a/packages/remix-dev/CHANGELOG.md
+++ b/packages/remix-dev/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/dev`
 
+## 2.9.0-pre.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.1`
+  - `@remix-run/node@2.9.0-pre.1`
+
 ## 2.9.0-pre.0
 
 ### Minor Changes
diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json
index 259aa2b4191..0fbccc13e9a 100644
--- a/packages/remix-dev/package.json
+++ b/packages/remix-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/dev",
-  "version": "2.9.0-pre.0",
+  "version": "2.9.0-pre.1",
   "description": "Dev tools and CLI for Remix",
   "homepage": "https://remix.run",
   "bugs": {
@@ -106,8 +106,8 @@
     "wrangler": "^3.28.2"
   },
   "peerDependencies": {
-    "@remix-run/react": "^2.9.0-pre.0",
-    "@remix-run/serve": "^2.9.0-pre.0",
+    "@remix-run/react": "^2.9.0-pre.1",
+    "@remix-run/serve": "^2.9.0-pre.1",
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2"
diff --git a/packages/remix-eslint-config/CHANGELOG.md b/packages/remix-eslint-config/CHANGELOG.md
index 622acdebbe6..03563bee65e 100644
--- a/packages/remix-eslint-config/CHANGELOG.md
+++ b/packages/remix-eslint-config/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `@remix-run/eslint-config`
 
+## 2.9.0-pre.1
+
 ## 2.9.0-pre.0
 
 ## 2.8.1
diff --git a/packages/remix-eslint-config/package.json b/packages/remix-eslint-config/package.json
index 93b8b66d208..499f0cb7dd6 100644
--- a/packages/remix-eslint-config/package.json
+++ b/packages/remix-eslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/eslint-config",
-  "version": "2.9.0-pre.0",
+  "version": "2.9.0-pre.1",
   "description": "ESLint configuration for Remix projects",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-express/CHANGELOG.md b/packages/remix-express/CHANGELOG.md
index 14206febef6..13e615802db 100644
--- a/packages/remix-express/CHANGELOG.md
+++ b/packages/remix-express/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/express`
 
+## 2.9.0-pre.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.1`
+
 ## 2.9.0-pre.0
 
 ### Patch Changes
diff --git a/packages/remix-express/package.json b/packages/remix-express/package.json
index fb5d49bcd40..446fdebfd54 100644
--- a/packages/remix-express/package.json
+++ b/packages/remix-express/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/express",
-  "version": "2.9.0-pre.0",
+  "version": "2.9.0-pre.1",
   "description": "Express server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-node/CHANGELOG.md b/packages/remix-node/CHANGELOG.md
index 311817f1c80..22cd0352eb6 100644
--- a/packages/remix-node/CHANGELOG.md
+++ b/packages/remix-node/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/node`
 
+## 2.9.0-pre.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.1`
+
 ## 2.9.0-pre.0
 
 ### Minor Changes
diff --git a/packages/remix-node/package.json b/packages/remix-node/package.json
index 9e5269fa1e7..82564f0d444 100644
--- a/packages/remix-node/package.json
+++ b/packages/remix-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/node",
-  "version": "2.9.0-pre.0",
+  "version": "2.9.0-pre.1",
   "description": "Node.js platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-react/CHANGELOG.md b/packages/remix-react/CHANGELOG.md
index 3c67cb744fd..4209535272a 100644
--- a/packages/remix-react/CHANGELOG.md
+++ b/packages/remix-react/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/react`
 
+## 2.9.0-pre.1
+
+### Patch Changes
+
+- [REMOVE] Loosen header check on turbo stream responses for SSG compatibility ([#9162](https://github.com/remix-run/remix/pull/9162))
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.1`
+
 ## 2.9.0-pre.0
 
 ### Minor Changes
diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json
index ada886683d7..c841c0d1498 100644
--- a/packages/remix-react/package.json
+++ b/packages/remix-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/react",
-  "version": "2.9.0-pre.0",
+  "version": "2.9.0-pre.1",
   "description": "React DOM bindings for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-serve/CHANGELOG.md b/packages/remix-serve/CHANGELOG.md
index 08edc9ff560..d7f78159719 100644
--- a/packages/remix-serve/CHANGELOG.md
+++ b/packages/remix-serve/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/serve`
 
+## 2.9.0-pre.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.1`
+  - `@remix-run/express@2.9.0-pre.1`
+
 ## 2.9.0-pre.0
 
 ### Patch Changes
diff --git a/packages/remix-serve/package.json b/packages/remix-serve/package.json
index 7141443dcda..982be060d59 100644
--- a/packages/remix-serve/package.json
+++ b/packages/remix-serve/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/serve",
-  "version": "2.9.0-pre.0",
+  "version": "2.9.0-pre.1",
   "description": "Production application server for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-server-runtime/CHANGELOG.md b/packages/remix-server-runtime/CHANGELOG.md
index 5a9a473e1c2..039c22632bb 100644
--- a/packages/remix-server-runtime/CHANGELOG.md
+++ b/packages/remix-server-runtime/CHANGELOG.md
@@ -1,5 +1,11 @@
 # `@remix-run/server-runtime`
 
+## 2.9.0-pre.1
+
+### Patch Changes
+
+- [REMOVE] Remove RR flags and implement via dataStrategy ([#9157](https://github.com/remix-run/remix/pull/9157))
+
 ## 2.9.0-pre.0
 
 ### Minor Changes
diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json
index c312d28ca08..b6826e15ee9 100644
--- a/packages/remix-server-runtime/package.json
+++ b/packages/remix-server-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/server-runtime",
-  "version": "2.9.0-pre.0",
+  "version": "2.9.0-pre.1",
   "description": "Server runtime for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-testing/CHANGELOG.md b/packages/remix-testing/CHANGELOG.md
index 49c28166b64..88237bf8606 100644
--- a/packages/remix-testing/CHANGELOG.md
+++ b/packages/remix-testing/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/testing`
 
+## 2.9.0-pre.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/react@2.9.0-pre.1`
+  - `@remix-run/node@2.9.0-pre.1`
+
 ## 2.9.0-pre.0
 
 ### Minor Changes
diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
index 7d253647247..01370cd927f 100644
--- a/packages/remix-testing/package.json
+++ b/packages/remix-testing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/testing",
-  "version": "2.9.0-pre.0",
+  "version": "2.9.0-pre.1",
   "description": "Testing utilities for Remix apps",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix/package.json b/packages/remix/package.json
index 65969d444c6..baa42eafe62 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "remix",
-  "version": "2.9.0-pre.0",
+  "version": "2.9.0-pre.1",
   "description": "A framework for building better websites",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e620a9438e2..7592ff36708 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -545,13 +545,13 @@ importers:
   integration/helpers/vite-cloudflare-template:
     dependencies:
       '@remix-run/cloudflare':
-        specifier: 2.9.0-pre.0
+        specifier: 2.9.0-pre.1
         version: link:../../../packages/remix-cloudflare
       '@remix-run/cloudflare-pages':
-        specifier: 2.9.0-pre.0
+        specifier: 2.9.0-pre.1
         version: link:../../../packages/remix-cloudflare-pages
       '@remix-run/react':
-        specifier: 2.9.0-pre.0
+        specifier: 2.9.0-pre.1
         version: link:../../../packages/remix-react
       isbot:
         specifier: ^4.1.0
@@ -865,7 +865,7 @@ importers:
         specifier: workspace:*
         version: link:../remix-node
       '@remix-run/react':
-        specifier: ^2.9.0-pre.0
+        specifier: ^2.9.0-pre.1
         version: link:../remix-react
       '@remix-run/router':
         specifier: 1.16.0-pre.1

From 7e5e85be612ce48950d192365b357004d3dd20ec Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Fri, 29 Mar 2024 16:14:31 -0400
Subject: [PATCH 047/108] Docs updates

---
 docs/guides/single-fetch.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/guides/single-fetch.md b/docs/guides/single-fetch.md
index 3fcfbfe9d4d..fd982274473 100644
--- a/docs/guides/single-fetch.md
+++ b/docs/guides/single-fetch.md
@@ -15,7 +15,7 @@ When you enable Single Fetch, Remix will make a single HTTP call to your server
 - Single fetch uses a new streaming format under the hood via [`turbo-stream`][turbo-stream], which means that we can stream down more complex data than just JSON
 - Naked objects returned from `loader` and `action` functions are no longer automatically converted into a JSON `Response` and are serialized as-is over the wire
 - Revalidation after an `action` `4xx`/`5xx` `Response` is now opt-in, versus opt-out
-- The `headers` function is no longer used when Single Fetch is enabled, in favor of the new `response` stub passed to your `loader`/`action` functions
+- The [`headers`][headers] function is no longer used when Single Fetch is enabled, in favor of the new `response` stub passed to your `loader`/`action` functions
 
 ## Details
 
@@ -51,7 +51,7 @@ You can control this by exporting a `streamTimeout` numeric value from your `ent
 
 ### Type Inference
 
-The current generics support type inference but have a built-in assumption of a JSON-serialized response. With the new streaming format, this assumption no longer holds so `useLoaderData<typeof loader>()` will _not_ return the proper types because it would assume that a `Date` would be a string on the client 😕. Unfortunately, we can't make these types aware of a runtime future flag and we do not want to introduce another hook just for this. Thankfully, the manual typing is also much simpler without needing to think about JSON serialization, so the current recommendation is to skip the generics when opting into single fetch and manually cast the type yourself:
+The current generics support type inference but have a built-in assumption of a JSON-serialized response. With the new streaming format, this assumption no longer holds so `useLoaderData<typeof loader>()` will _not_ return the proper types because it would assume that a `Date` would be a string on the client 😕. Unfortunately, we can't make these types aware of a runtime future flag and we do not want to introduce another hook just for this. Thankfully, the manual typing is much simpler without needing to think about JSON serialization, so the current recommendation is to skip the generics when opting into single fetch and manually cast the type yourself:
 
 ```ts
 export async function loader() {
@@ -68,18 +68,20 @@ export default function Component() {
   //    ^? { message: string, date: string }
 
   // ✅ After
-  const data = useLoaderData() as Awaited<
+  const data = useLoaderData() as unknown as Awaited<
     ReturnType<typeof loader>
   >;
   //    ^? { message: string, date: Date }
 }
 ```
 
-In the next version of Remix, we may re-introduce this generic, but because it's so simple in the meantime you could wrap this up into your own utility:
+In the next version of Remix, we may re-introduce this generic, but in the meantime you could wrap this up into your own utility:
 
 ```ts
 function useTypedLoaderData<T>() {
-  return useLoaderData() as Awaited<ReturnType<T>>;
+  return useLoaderData() as unknown as Awaited<
+    ReturnType<T>
+  >;
 }
 ```
 
@@ -91,8 +93,6 @@ With Single Fetch, if an `action` returns or throws a `Response` with a `4xx/5xx
 
 Revalidation is handled via a `?_routes` query string parameter on the single fetch HTTP call which limits the loaders being called. This means that when you are doing fine-grained revalidation, you will have cache enumerations based on the routes being requested - but all of the information is in the URL so you should not need any special CDN configurations (as opposed to if this was done via a custom header that required your CDN to respect the `Vary` header).
 
-This "functionality" is handled via the `future.unstable_skipActionErrorRevalidation` flag in React Router, which is always set to true when Single Fetch is enabled.
-
 ### Headers
 
 The [`headers`][headers] function is no longer used when Single Fetch is enabled.
@@ -100,7 +100,7 @@ Instead, your `loader`/`action` functions now receive a mutable `response` param
 
 ```ts
 type ResponseStub = {
-  status: numbers | undefined;
+  status: number | undefined;
   headers: Headers;
 };
 ```
@@ -108,9 +108,9 @@ type ResponseStub = {
 - To alter the status of your HTTP Response, set the `status` field directly:
   - `response.status = 201`
 - To set the headers on your HTTP Response, use the standard [`Headers`][mdn-headers] APIs:
-  - `response.headers.set`
-  - `response.headers.append`
-  - `response.headers.delete`
+  - `response.headers.set(name, value)`
+  - `response.headers.append(name, value)`
+  - `response.headers.delete(name)`
 
 ```ts
 export async function action({ request, response }) {

From 2ef574cc025e2a0ba1428d444ee627ced2cb0b27 Mon Sep 17 00:00:00 2001
From: Brooks Lybrand <brookslybrand@gmail.com>
Date: Mon, 1 Apr 2024 10:39:24 -0500
Subject: [PATCH 048/108] Update CHANGELOG.md

docs: fix typo in changelog
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0cc3044f069..bef9395aade 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -189,7 +189,7 @@ Wih Remix `2.9.0`, we have switched the underlying [Web Fetch](https://developer
 
 - It allows us to stop maintaining our own [web-std-io fork](https://github.com/remix-run/web-std-io)
 - It should bring us more in-line with spec compliance
-  - ⚠️ It is possible that some non-spec-compliant bugs in our fork will be fixed" wit this move, so beware of "breaking bug fixes" and keep an eye on any advanced fetch API interactions you're performing in your app
+  - ⚠️ It is possible that some non-spec-compliant bugs in our fork will be fixed" with this move, so beware of "breaking bug fixes" and keep an eye on any advanced fetch API interactions you're performing in your app
 - Because `undici` is the fetch implementation used by `node` internally, it should better prepare Remix apps to more smoothly drop the polyfill to use the built-in Node.js APIs on `node` 20+
 
 ### Minor Changes

From 2edd5114207e3b76033637fd8069c0f450059371 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Mon, 1 Apr 2024 15:35:36 -0400
Subject: [PATCH 049/108] Remove Future subheading on docs site and update CLI
 links (#9176)

---
 .changeset/update-docs.md                 |  5 +++++
 docs/discussion/server-vs-client.md       |  6 +++---
 docs/file-conventions/-client.md          |  4 ++--
 docs/file-conventions/-server.md          |  4 ++--
 docs/file-conventions/remix-config.md     | 19 ++++-------------
 docs/file-conventions/vite-config.md      | 21 +++++--------------
 docs/future/index.md                      |  3 ---
 docs/guides/contributing.md               |  1 -
 docs/guides/gotchas.md                    |  2 +-
 docs/guides/local-tls.md                  |  2 +-
 docs/guides/manual-mode.md                |  2 +-
 docs/guides/mdx.md                        |  3 +--
 docs/guides/migrating-react-router-app.md |  4 ++--
 docs/guides/performance.md                |  2 +-
 docs/{future => guides}/presets.md        |  0
 docs/{future => guides}/server-bundles.md |  0
 docs/{future => guides}/spa-mode.md       |  2 +-
 docs/guides/templates.md                  |  1 -
 docs/{future => guides}/vite.md           | 10 +++------
 docs/other-api/dev.md                     |  4 ++--
 docs/start/future-flags.md                | 25 +++++++++++++++++++----
 docs/start/v2.md                          |  4 ++--
 docs/styling/bundling.md                  |  4 ++--
 docs/styling/css-imports.md               |  2 +-
 docs/styling/css-modules.md               |  4 ++--
 docs/styling/css.md                       |  4 ++--
 docs/styling/postcss.md                   |  4 ++--
 docs/styling/tailwind.md                  |  4 ++--
 docs/styling/vanilla-extract.md           |  4 ++--
 docs/tutorials/jokes.md                   |  4 ++--
 integration/vite-dot-server-test.ts       |  4 ++--
 integration/vite-spa-mode-test.ts         |  4 ++--
 packages/remix-dev/vite/plugin.ts         |  8 ++++----
 templates/cloudflare/README.md            |  2 +-
 templates/express/README.md               |  2 +-
 templates/remix-javascript/README.md      |  2 +-
 templates/remix/README.md                 |  2 +-
 templates/spa/README.md                   |  2 +-
 templates/spa/app/routes/_index.tsx       |  2 +-
 templates/vite/README.md                  |  2 +-
 40 files changed, 87 insertions(+), 97 deletions(-)
 create mode 100644 .changeset/update-docs.md
 delete mode 100644 docs/future/index.md
 rename docs/{future => guides}/presets.md (100%)
 rename docs/{future => guides}/server-bundles.md (100%)
 rename docs/{future => guides}/spa-mode.md (99%)
 rename docs/{future => guides}/vite.md (99%)

diff --git a/.changeset/update-docs.md b/.changeset/update-docs.md
new file mode 100644
index 00000000000..4f329c4b8cf
--- /dev/null
+++ b/.changeset/update-docs.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/dev": patch
+---
+
+Update links printed to the console by the Remix CLI/Dev Server to point to updated docs locations
diff --git a/docs/discussion/server-vs-client.md b/docs/discussion/server-vs-client.md
index 6f30d56a027..173a6fa352f 100644
--- a/docs/discussion/server-vs-client.md
+++ b/docs/discussion/server-vs-client.md
@@ -182,8 +182,8 @@ export const PostPreview = ({ title, description }) => {
 [file_convention_client]: ../file-conventions/-client
 [file_convention_server]: ../file-conventions/-server
 [window_global]: https://developer.mozilla.org/en-US/docs/Web/API/Window/window
-[server-bundles]: ../future/server-bundles
+[server-bundles]: ../guides/server-bundles
 [vite-config]: ../file-conventions/vite-configuration
 [vite-env-only]: https://github.com/pcattori/vite-env-only
-[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
-[remix-vite]: ../future/vite
+[classic-remix-compiler]: ../guides/vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ../guides/vite
diff --git a/docs/file-conventions/-client.md b/docs/file-conventions/-client.md
index 6a4a5f76536..cbf812d8426 100644
--- a/docs/file-conventions/-client.md
+++ b/docs/file-conventions/-client.md
@@ -28,5 +28,5 @@ console.log(supportsVibrationAPI);
 Refer to the Route Module section in the sidebar for more information.
 
 [use_effect]: https://react.dev/reference/react/useEffect
-[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
-[remix-vite]: ../future/vite
+[classic-remix-compiler]: ../guides/vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ../guides/vite
diff --git a/docs/file-conventions/-server.md b/docs/file-conventions/-server.md
index 57530879e99..9c51eb0a9ac 100644
--- a/docs/file-conventions/-server.md
+++ b/docs/file-conventions/-server.md
@@ -27,5 +27,5 @@ Refer to the Route Module section in the sidebar for more information.
 
 <docs-warning>When using the [Classic Remix Compiler][classic-remix-compiler], `.server` modules are replaced with empty modules and will not result in a compilation error. Note that this can result in runtime errors.</docs-warning>
 
-[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
-[remix-vite]: ../future/vite
+[classic-remix-compiler]: ../guides/vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ../guides/vite
diff --git a/docs/file-conventions/remix-config.md b/docs/file-conventions/remix-config.md
index ac38745c5cc..6905cabb2d0 100644
--- a/docs/file-conventions/remix-config.md
+++ b/docs/file-conventions/remix-config.md
@@ -74,14 +74,7 @@ relative to `remix.config.js`. Defaults to `".cache"`.
 
 ## future
 
-The `future` config lets you opt-into future breaking changes via [Future Flags][future-flags]. The following future flags currently exist in Remix v2 and will become the default behavior in Remix v3:
-
-- **`v3_fetcherPersist`**: Change fetcher persistence/cleanup behavior in 2 ways ([RFC][fetcherpersist-rfc]):
-  - Fetchers are no longer removed on unmount, and remain exposed via [`useFetchers`][use-fetchers] until they return to an `idle` state
-  - Fetchers that complete while still mounted no longer persist in [`useFetchers`][use-fetchers] since you can access those fetchers via [`useFetcher`][use-fetcher]
-- **`v3_relativeSplatPath`**: Fixes buggy relative path resolution in splat routes. Please see the [React Router docs][relativesplatpath] for more information.
-- **`v3_throwAbortReason`**: When a server-side request is aborted, Remix will throw the `request.signal.reason` instead of an error such as `new Error("query() call aborted...")`
-- **`unstable_singleFetch`**: Opt into [Single Fetch][single-fetch] behavior
+The `future` config lets you opt-into future breaking changes via [Future Flags][future-flags]. Please see the [Current Future Flags][current-future-flags] section for a list of all available Future Flags.
 
 ## ignoredRouteFiles
 
@@ -282,11 +275,7 @@ There are a few conventions that Remix uses you should be aware of.
 [browser-node-builtins-polyfill]: #browsernodebuiltinspolyfill
 [server-node-builtins-polyfill]: #servernodebuiltinspolyfill
 [future-flags]: ../start/future-flags
-[fetcherpersist-rfc]: https://github.com/remix-run/remix/discussions/7698
-[use-fetchers]: ../hooks/use-fetchers
-[use-fetcher]: ../hooks/use-fetcher
-[relativesplatpath]: https://reactrouter.com/en/main/hooks/use-resolved-path#splat-paths
-[single-fetch]: ../guides/single-fetch
-[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
-[remix-vite]: ../future/vite
+[classic-remix-compiler]: ../guides/vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ../guides/vite
 [vite-config]: ./vite-configuration
+[current-future-flags]: ../start/future-flags#current-future-flags
diff --git a/docs/file-conventions/vite-config.md b/docs/file-conventions/vite-config.md
index 396e8eae8ae..aa9900d2a4d 100644
--- a/docs/file-conventions/vite-config.md
+++ b/docs/file-conventions/vite-config.md
@@ -52,14 +52,7 @@ The path to the `app` directory, relative to the project root. Defaults to
 
 #### future
 
-The `future` config lets you opt-into future breaking changes via [Future Flags][future-flags]. The following future flags currently exist in Remix v2 and will become the default behavior in Remix v3:
-
-- **`v3_fetcherPersist`**: Change fetcher persistence/cleanup behavior in 2 ways ([RFC][fetcherpersist-rfc]):
-  - Fetchers are no longer removed on unmount, and remain exposed via [`useFetchers`][use-fetchers] until they return to an `idle` state
-  - Fetchers that complete while still mounted no longer persist in [`useFetchers`][use-fetchers] since you can access those fetchers via [`useFetcher`][use-fetcher]
-- **`v3_relativeSplatPath`**: Fixes buggy relative path resolution in splat routes. Please see the [React Router docs][relativesplatpath] for more information.
-- **`v3_throwAbortReason`**: When a server-side request is aborted, Remix will throw the `request.signal.reason` instead of an error such as `new Error("query() call aborted...")`
-- **`unstable_singleFetch`**: Opt into [Single Fetch][single-fetch] behavior
+The `future` config lets you opt-into future breaking changes via [Future Flags][future-flags]. Please see the [Current Future Flags][current-future-flags] section for a list of all available Future Flags.
 
 #### ignoredRouteFiles
 
@@ -140,18 +133,14 @@ A function for assigning addressable routes to [server bundles][server-bundles].
 
 You may also want to enable the `manifest` option since, when server bundles are enabled, it contains mappings between routes and server bundles.
 
-[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
+[classic-remix-compiler]: ../guides/vite#classic-remix-compiler-vs-remix-vite
 [remix-config]: ./remix-config
 [vite]: https://vitejs.dev
 [future-flags]: ../start/future-flags
-[fetcherpersist-rfc]: https://github.com/remix-run/remix/discussions/7698
-[use-fetchers]: ../hooks/use-fetchers
-[use-fetcher]: ../hooks/use-fetcher
-[relativesplatpath]: https://reactrouter.com/en/main/hooks/use-resolved-path#splat-paths
 [minimatch]: https://npm.im/minimatch
-[presets]: ../future/presets
-[server-bundles]: ../future/server-bundles
+[presets]: ../guides/presets
+[server-bundles]: ../guides/server-bundles
 [rr-basename]: https://reactrouter.com/routers/create-browser-router#basename
 [vite-public-base-path]: https://vitejs.dev/config/shared-options.html#base
 [vite-base]: https://vitejs.dev/config/shared-options.html#base
-[single-fetch]: ../guides/single-fetch
+[current-future-flags]: ../start/future-flags#current-future-flags
diff --git a/docs/future/index.md b/docs/future/index.md
deleted file mode 100644
index ff789c6d3c4..00000000000
--- a/docs/future/index.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-title: Future
----
diff --git a/docs/guides/contributing.md b/docs/guides/contributing.md
index f2a5c3ee9d1..c2a8dbf7902 100644
--- a/docs/guides/contributing.md
+++ b/docs/guides/contributing.md
@@ -1,7 +1,6 @@
 ---
 title: Contributing
 description: Thank you for contributing to Remix! Here's everything you need to know before you open a pull request.
-order: 6
 ---
 
 # Contributing to Remix
diff --git a/docs/guides/gotchas.md b/docs/guides/gotchas.md
index 4bc42abd0e6..2e7ae4b208c 100644
--- a/docs/guides/gotchas.md
+++ b/docs/guides/gotchas.md
@@ -206,4 +206,4 @@ Note that, even if this issue didn't exist, we'd still recommend using named re-
 [fetch]: https://developer.mozilla.org/en-US/docs/Web/API/fetch
 [set_cookie_header]: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie
 [cookie_header]: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cookie
-[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
+[classic-remix-compiler]: ./vite#classic-remix-compiler-vs-remix-vite
diff --git a/docs/guides/local-tls.md b/docs/guides/local-tls.md
index 474c51f6247..501a68980c8 100644
--- a/docs/guides/local-tls.md
+++ b/docs/guides/local-tls.md
@@ -118,4 +118,4 @@ remix dev --tls-key=key.pem --tls-cert=cert.pem -c "node ./server.js"
 Your app should now be running with local TLS!
 
 [mkcert]: https://github.com/FiloSottile/mkcert#installation
-[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
+[classic-remix-compiler]: ./vite#classic-remix-compiler-vs-remix-vite
diff --git a/docs/guides/manual-mode.md b/docs/guides/manual-mode.md
index b201c089018..ec6d48d409e 100644
--- a/docs/guides/manual-mode.md
+++ b/docs/guides/manual-mode.md
@@ -310,4 +310,4 @@ There is also a handy [`remember` utility][remember] that can help out here if y
 [templates]: https://github.com/remix-run/remix/blob/main/templates
 [community_examples]: https://github.com/xHomu/remix-v2-server
 [remember]: https://npm.im/@epic-web/remember
-[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
+[classic-remix-compiler]: ./vite#classic-remix-compiler-vs-remix-vite
diff --git a/docs/guides/mdx.md b/docs/guides/mdx.md
index 8bc2b01f96d..a7b9ba78a18 100644
--- a/docs/guides/mdx.md
+++ b/docs/guides/mdx.md
@@ -204,9 +204,8 @@ exports.mdx = async (filename) => {
 };
 ```
 
-[remix-vite]: ../future//vite
 [mdx-plugin]: https://mdxjs.com/packages/rollup
 [mdx]: https://mdxjs.com
 [yaml]: https://yaml.org
 [mdx-bundler]: https://github.com/kentcdodds/mdx-bundler
-[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
+[classic-remix-compiler]: ./vite#classic-remix-compiler-vs-remix-vite
diff --git a/docs/guides/migrating-react-router-app.md b/docs/guides/migrating-react-router-app.md
index 3ada2dfd318..14d1f4a5dc5 100644
--- a/docs/guides/migrating-react-router-app.md
+++ b/docs/guides/migrating-react-router-app.md
@@ -727,5 +727,5 @@ Now then, go off and _remix your app_. We think you'll like what you build along
 [css-side-effect-imports]: ./styling#css-side-effect-imports
 [css-bundling]: ./styling#css-bundling
 [open-graph-protocol]: https://ogp.me
-[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
-[remix-vite]: ../future/vite
+[classic-remix-compiler]: ./vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ./vite
diff --git a/docs/guides/performance.md b/docs/guides/performance.md
index 99c30c745ab..2c5cc11f0b3 100644
--- a/docs/guides/performance.md
+++ b/docs/guides/performance.md
@@ -69,4 +69,4 @@ Here are some other technologies to help speed up your servers:
 [lru-cache]: https://www.npmjs.com/package/lru-cache
 [redis]: https://www.npmjs.com/package/redis
 [https-esbuild-github-io-analyze]: https://esbuild.github.io/analyze
-[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
+[classic-remix-compiler]: ./vite#classic-remix-compiler-vs-remix-vite
diff --git a/docs/future/presets.md b/docs/guides/presets.md
similarity index 100%
rename from docs/future/presets.md
rename to docs/guides/presets.md
diff --git a/docs/future/server-bundles.md b/docs/guides/server-bundles.md
similarity index 100%
rename from docs/future/server-bundles.md
rename to docs/guides/server-bundles.md
diff --git a/docs/future/spa-mode.md b/docs/guides/spa-mode.md
similarity index 99%
rename from docs/future/spa-mode.md
rename to docs/guides/spa-mode.md
index d3dec43c7bd..fe7088e63bf 100644
--- a/docs/future/spa-mode.md
+++ b/docs/guides/spa-mode.md
@@ -294,7 +294,7 @@ Once you've got all your routes living in their own files, you can:
 [meta]: ../components/meta
 [links]: ../components/links
 [migrating-rr]: https://remix.run/docs/en/main/guides/migrating-react-router-app
-[remix-vite]: ../future/vite
+[remix-vite]: ./vite
 [migrate-rr]: #migrating-from-react-router
 [react-lazy]: https://react.dev/reference/react/lazy
 [client-only]: https://github.com/sergiodxa/remix-utils?tab=readme-ov-file#clientonly
diff --git a/docs/guides/templates.md b/docs/guides/templates.md
index 6dafaf65e89..96928197c3b 100644
--- a/docs/guides/templates.md
+++ b/docs/guides/templates.md
@@ -1,7 +1,6 @@
 ---
 title: Templates
 description: The quickest way to get rocking and rolling with Remix
-order: 3
 ---
 
 # Templates and Stacks
diff --git a/docs/future/vite.md b/docs/guides/vite.md
similarity index 99%
rename from docs/future/vite.md
rename to docs/guides/vite.md
index 49e3f6bbd45..841b7f68c29 100644
--- a/docs/future/vite.md
+++ b/docs/guides/vite.md
@@ -487,7 +487,8 @@ export const onRequest = createPagesFunctionHandler({
 👉 **Access Bindings and Environment Variables through `context.cloudflare.env` instead of `context.env`**
 
 While you'll mostly use Vite during development, you can also use Wrangler to preview and deploy your app.
-To learn more, see [_Cloudflare > Vite & Wrangler_][cloudflare-vite-and-wrangler].
+
+To learn more, see the [_Cloudflare_][cloudflare-vite] section of this document.
 
 👉 **Update your `package.json` scripts**
 
@@ -1126,14 +1127,12 @@ Finally, we were inspired by how other frameworks implemented Vite support:
 [server-dependencies-to-bundle]: https://remix.run/docs/en/main/file-conventions/remix-config#serverdependenciestobundle
 [blues-stack]: https://github.com/remix-run/blues-stack
 [global-node-polyfills]: ../other-api/node#polyfills
-[server-bundles]: ./server-bundles
 [vite-plugin-inspect]: https://github.com/antfu/vite-plugin-inspect
 [vite-perf]: https://vitejs.dev/guide/performance.html
 [node-options]: https://nodejs.org/api/cli.html#node_optionsoptions
 [rollup-plugin-visualizer]: https://github.com/btd/rollup-plugin-visualizer
 [debugging]: #debugging
 [performance]: #performance
-[vite-env-only]: https://github.com/pcattori/vite-env-only
 [explicitly-isolate-server-only-code]: #splitting-up-client-and-server-code
 [route-component]: ../route/component
 [error-boundary]: ../route/error-boundary
@@ -1152,12 +1151,9 @@ Finally, we were inspired by how other frameworks implemented Vite support:
 [wrangler-getplatformproxy]: https://developers.cloudflare.com/workers/wrangler/api/#getplatformproxy
 [wrangler-getplatformproxy-return]: https://developers.cloudflare.com/workers/wrangler/api/#return-type-1
 [remix-config-server]: https://remix.run/docs/en/main/file-conventions/remix-config#server
-[cloudflare-vite-and-wrangler]: #vite--wrangler
-[rr-basename]: https://reactrouter.com/routers/create-browser-router#basename
-[vite-public-base-path]: https://vitejs.dev/config/shared-options.html#base
+[cloudflare-vite]: #cloudflare
 [vite-base]: https://vitejs.dev/config/shared-options.html#base
 [how-fix-cjs-esm]: https://www.youtube.com/watch?v=jmNuEEtwkD4
-[presets]: ./presets
 [fix-up-css-imports-referenced-in-links]: #fix-up-css-imports-referenced-in-links
 [vite-plugin-react]: https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-react
 [splitting-up-client-and-server-code]: ../discussion/server-vs-client
diff --git a/docs/other-api/dev.md b/docs/other-api/dev.md
index 5709f6f3cf6..098c729f2ef 100644
--- a/docs/other-api/dev.md
+++ b/docs/other-api/dev.md
@@ -369,5 +369,5 @@ While the initial build slowdown is inherently a cost for HDR, we plan to optimi
 [bundle_analysis]: ../guides/performance
 [manual_mode]: ../guides/manual-mode
 [hmr]: ../discussion/hot-module-replacement
-[remix-vite]: ../future/vite
-[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ../guides/vite
+[classic-remix-compiler]: ../guides/vite#classic-remix-compiler-vs-remix-vite
diff --git a/docs/start/future-flags.md b/docs/start/future-flags.md
index cb4c1a14179..4dd92a036df 100644
--- a/docs/start/future-flags.md
+++ b/docs/start/future-flags.md
@@ -12,7 +12,7 @@ In our approach to software development, we aim to achieve the following goals f
 
 ## Unstable APIs and Future Flags
 
-We introduce new features into the current release with a future flag that looks something like `unstable_someFeature`.
+We introduce new features into the current release with a future flag that looks something like `unstable_someFeature`. You can specify these flags in the Remix Vite Plugin `future` option in your [`vite.config.ts`][vite-config-future] file:
 
 ```ts filename=vite.config.ts lines=[7-9]
 import { vitePlugin as remix } from "@remix-run/dev";
@@ -29,6 +29,8 @@ export default defineConfig({
 });
 ```
 
+<docs-info>If you are not yet using Vite, you can provide Future Flags via the [`remix.config.js` `future`][remix-config-future] option</docs-info>
+
 - Once an unstable feature reaches a stable state, we remove the special prefix and include the feature in the next minor release. At this point, the API's structure remains consistent throughout subsequent minor releases.
 
 - This approach allows us to refine the API collaboratively with early adopters, incorporating necessary changes in the unstable phase without affecting all users. The stable releases then benefit from these improvements without disruptions.
@@ -59,10 +61,25 @@ export default defineConfig({
 - If all the `v3_*` future flags are enabled, transitioning to `v3` should ideally not necessitate any changes to your codebase.
 - Some future flags that bring about breaking changes initially start as `unstable_*` flags. These might undergo modifications during minor releases. Once they become `v3_*` future flags, the corresponding API is set and won't change further.
 
+## Current Future Flags
+
+The following future flags currently exist in Remix v2 and will become the default behavior in Remix v3:
+
+- **`v3_fetcherPersist`**: Change fetcher persistence/cleanup behavior in 2 ways ([RFC][fetcherpersist-rfc]):
+  - Fetchers are no longer removed on unmount, and remain exposed via [`useFetchers`][use-fetchers] until they return to an `idle` state
+  - Fetchers that complete while still mounted no longer persist in [`useFetchers`][use-fetchers] since you can access those fetchers via [`useFetcher`][use-fetcher]
+- **`v3_relativeSplatPath`**: Fixes buggy relative path resolution in splat routes. Please see the [React Router docs][relativesplatpath] for more information.
+- **`v3_throwAbortReason`**: When a server-side request is aborted, Remix will throw the `request.signal.reason` instead of an error such as `new Error("query() call aborted...")`
+- **`unstable_singleFetch`**: Opt into [Single Fetch][single-fetch] behavior
+
 ## Summary
 
 Our development strategy focuses on gradual feature adoption and seamless version upgrades for major releases. This empowers developers to selectively integrate new features, avoiding the need for extensive code adjustments during version transitions. By introducing features through `unstable_*` flags, we refine the API collaboratively with early adopters while ensuring stable releases benefit from enhancements. Through careful management of breaking changes using `v3_*` flags, we provide the flexibility to adopt changes incrementally, facilitating a smoother transition between major versions. While this increases the complexity for developing Remix the framework, this developer-centric approach greatly simplifies application development with Remix, ultimately leading to improved software quality and (hopefully!) developer satisfaction.
 
-For a list of currently available Future Flags, please see the [`future`][remix-config-future] section in the `vite.config.ts` documentation.
-
-[remix-config-future]: ../file-conventions/vite-config#future
+[vite-config-future]: ../file-conventions/vite-config#future
+[remix-config-future]: ../file-conventions/remix-config#future
+[fetcherpersist-rfc]: https://github.com/remix-run/remix/discussions/7698
+[use-fetchers]: ../hooks/use-fetchers
+[use-fetcher]: ../hooks/use-fetcher
+[relativesplatpath]: https://reactrouter.com/en/main/hooks/use-resolved-path#splat-paths
+[single-fetch]: ../guides/single-fetch
diff --git a/docs/start/v2.md b/docs/start/v2.md
index 95dc0af306a..caaf3076507 100644
--- a/docs/start/v2.md
+++ b/docs/start/v2.md
@@ -1110,8 +1110,8 @@ module.exports = {
 
 Please see the [`serverModuleFormat`][server-module-format] section.
 
-[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
-[remix-vite]: ../future/vite
+[classic-remix-compiler]: ../guides/vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ../guides/vite
 [future-flags]: ./future-flags
 [remix_config]: ../file-conventions/remix-config
 [pass_through_class]: https://nodejs.org/api/stream.html#class-streampassthrough
diff --git a/docs/styling/bundling.md b/docs/styling/bundling.md
index e695de54cb5..085c7d54030 100644
--- a/docs/styling/bundling.md
+++ b/docs/styling/bundling.md
@@ -49,6 +49,6 @@ Avoid using `export *` due to an [issue with `esbuild`'s CSS tree shaking][esbui
 [css-modules]: ./css-modules
 [vanilla-extract]: ./vanilla-extract
 [regular-stylesheet-imports]: ./css
-[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
-[remix-vite]: ../future/vite
+[classic-remix-compiler]: ../guides/vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ../guides/vite
 [vite-css]: https://vitejs.dev/guide/features#css
diff --git a/docs/styling/css-imports.md b/docs/styling/css-imports.md
index 4c0cf49c94a..0f92747ffa4 100644
--- a/docs/styling/css-imports.md
+++ b/docs/styling/css-imports.md
@@ -34,4 +34,4 @@ module.exports = {
 
 [css-bundling]: ./bundling
 [server-dependencies-to-bundle]: ../file-conventions/remix-config#serverdependenciestobundle
-[remix-vite]: ../future/vite
+[remix-vite]: ../guides/vite
diff --git a/docs/styling/css-modules.md b/docs/styling/css-modules.md
index 8003688da76..da845d46786 100644
--- a/docs/styling/css-modules.md
+++ b/docs/styling/css-modules.md
@@ -37,6 +37,6 @@ Button.displayName = "Button";
 
 [css-bundling]: ./bundling
 [css-modules]: https://github.com/css-modules/css-modules
-[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
-[remix-vite]: ../future/vite
+[classic-remix-compiler]: ../guides/vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ../guides/vite
 [vite-css-modules]: https://vitejs.dev/guide/features#css-modules
diff --git a/docs/styling/css.md b/docs/styling/css.md
index 494f8f96a10..02df370b322 100644
--- a/docs/styling/css.md
+++ b/docs/styling/css.md
@@ -332,5 +332,5 @@ export const links: LinksFunction = () => {
 [links]: ../route/links
 [custom-properties]: https://developer.mozilla.org/en-US/docs/Web/CSS/--*
 [link]: ../components/link
-[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
-[remix-vite]: ../future/vite
+[classic-remix-compiler]: ../guides/vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ../guides/vite
diff --git a/docs/styling/postcss.md b/docs/styling/postcss.md
index 3d3e7e08e9b..7ae63320558 100644
--- a/docs/styling/postcss.md
+++ b/docs/styling/postcss.md
@@ -105,6 +105,6 @@ An example using SASS.
 [css-bundling]: ./bundling
 [postcss-preset-env]: https://preset-env.cssdb.org
 [esbuild-css-tree-shaking-issue]: https://github.com/evanw/esbuild/issues/1370
-[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
-[remix-vite]: ../future/vite
+[classic-remix-compiler]: ../guides/vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ../guides/vite
 [vite-postcss]: https://vitejs.dev/guide/features#postcss
diff --git a/docs/styling/tailwind.md b/docs/styling/tailwind.md
index fb0475f3ccb..e41dddb56c0 100644
--- a/docs/styling/tailwind.md
+++ b/docs/styling/tailwind.md
@@ -83,6 +83,6 @@ Alternatively, you can use [PostCSS][built-in-post-css-support] with the [postcs
 [built-in-post-css-support]: ./postcss
 [tailwind-intelli-sense-extension]: https://marketplace.visualstudio.com/items?itemName=bradlc.vscode-tailwindcss
 [postcss-import]: https://github.com/postcss/postcss-import
-[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
-[remix-vite]: ../future/vite
+[classic-remix-compiler]: ../guides/vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ../guides/vite
 [vite-postcss]: https://vitejs.dev/guide/features#postcss
diff --git a/docs/styling/vanilla-extract.md b/docs/styling/vanilla-extract.md
index f28a50609d8..3d742f31bcb 100644
--- a/docs/styling/vanilla-extract.md
+++ b/docs/styling/vanilla-extract.md
@@ -48,6 +48,6 @@ Button.displayName = "Button";
 [vanilla-extract]: https://vanilla-extract.style
 [sprinkles]: https://vanilla-extract.style/documentation/packages/sprinkles
 [css-bundling]: ./bundling
-[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
-[remix-vite]: ../future/vite
+[classic-remix-compiler]: ../guides/vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ../guides/vite
 [vanilla-extract-vite]: https://vanilla-extract.style/documentation/integrations/vite
diff --git a/docs/tutorials/jokes.md b/docs/tutorials/jokes.md
index 8c38a8dee03..2e991e87fcd 100644
--- a/docs/tutorials/jokes.md
+++ b/docs/tutorials/jokes.md
@@ -7784,8 +7784,8 @@ Any time you make a change, simply run `fly deploy` again to redeploy.
 
 Phew! And there we have it. If you made it through this whole thing then I'm really impressed ([tweet your success][tweet-your-success])! There's a lot to Remix, and we've only gotten you started. Good luck on the rest of your Remix journey!
 
-[classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
-[remix-vite]: ../future/vite
+[classic-remix-compiler]: ../guides/vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ../guides/vite
 [remix-jokes]: https://remix-jokes.lol
 [mdn]: https://developer.mozilla.org/en-US
 [prisma]: https://www.prisma.io
diff --git a/integration/vite-dot-server-test.ts b/integration/vite-dot-server-test.ts
index 67ca42fc89b..b21edc3d606 100644
--- a/integration/vite-dot-server-test.ts
+++ b/integration/vite-dot-server-test.ts
@@ -148,7 +148,7 @@ test.describe("Vite / route / server-only module referenced by client", () => {
 
         `  But other route exports in 'app/routes/_index.tsx' depend on '${specifier}'.`,
 
-        "  See https://remix.run/docs/en/main/future/vite#splitting-up-client-and-server-code",
+        "  See https://remix.run/docs/en/main/guides/vite#splitting-up-client-and-server-code",
       ].forEach(expect(stderr).toMatch);
     });
   }
@@ -208,7 +208,7 @@ test.describe("Vite / non-route / server-only module referenced by client", () =
 
         `    '${specifier}' imported by 'app/reexport-server-only.ts'`,
 
-        "  See https://remix.run/docs/en/main/future/vite#splitting-up-client-and-server-code",
+        "  See https://remix.run/docs/en/main/guides/vite#splitting-up-client-and-server-code",
       ].forEach(expect(stderr).toMatch);
     });
   }
diff --git a/integration/vite-spa-mode-test.ts b/integration/vite-spa-mode-test.ts
index d7d6adc87ac..6bccd256a4f 100644
--- a/integration/vite-spa-mode-test.ts
+++ b/integration/vite-spa-mode-test.ts
@@ -44,7 +44,7 @@ test.describe("SPA Mode", () => {
         let stderr = result.stderr.toString("utf8");
         expect(stderr).toMatch(
           "SPA Mode: 3 invalid route export(s) in `routes/invalid-exports.tsx`: " +
-            "`headers`, `loader`, `action`. See https://remix.run/future/spa-mode " +
+            "`headers`, `loader`, `action`. See https://remix.run/guides/spa-mode " +
             "for more information."
         );
       });
@@ -74,7 +74,7 @@ test.describe("SPA Mode", () => {
         expect(stderr).toMatch(
           "SPA Mode: Invalid `HydrateFallback` export found in `routes/invalid-exports.tsx`. " +
             "`HydrateFallback` is only permitted on the root route in SPA Mode. " +
-            "See https://remix.run/future/spa-mode for more information."
+            "See https://remix.run/guides/spa-mode for more information."
         );
       });
 
diff --git a/packages/remix-dev/vite/plugin.ts b/packages/remix-dev/vite/plugin.ts
index 2160bcf7edf..0366cec8f08 100644
--- a/packages/remix-dev/vite/plugin.ts
+++ b/packages/remix-dev/vite/plugin.ts
@@ -1548,7 +1548,7 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
               "",
               `  But other route exports in '${importerShort}' depend on '${id}'.`,
               "",
-              "  See https://remix.run/docs/en/main/future/vite#splitting-up-client-and-server-code",
+              "  See https://remix.run/docs/en/main/guides/vite#splitting-up-client-and-server-code",
               "",
             ].join("\n")
           );
@@ -1560,7 +1560,7 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
             "",
             `    '${id}' imported by '${importerShort}'`,
             "",
-            "  See https://remix.run/docs/en/main/future/vite#splitting-up-client-and-server-code",
+            "  See https://remix.run/docs/en/main/guides/vite#splitting-up-client-and-server-code",
             "",
           ].join("\n")
         );
@@ -1603,7 +1603,7 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
             let str = serverOnlyExports.map((e) => `\`${e}\``).join(", ");
             let message =
               `SPA Mode: ${serverOnlyExports.length} invalid route export(s) in ` +
-              `\`${route.file}\`: ${str}. See https://remix.run/future/spa-mode ` +
+              `\`${route.file}\`: ${str}. See https://remix.run/guides/spa-mode ` +
               `for more information.`;
             throw Error(message);
           }
@@ -1616,7 +1616,7 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
               let message =
                 `SPA Mode: Invalid \`HydrateFallback\` export found in ` +
                 `\`${route.file}\`. \`HydrateFallback\` is only permitted on ` +
-                `the root route in SPA Mode. See https://remix.run/future/spa-mode ` +
+                `the root route in SPA Mode. See https://remix.run/guides/spa-mode ` +
                 `for more information.`;
               throw Error(message);
             }
diff --git a/templates/cloudflare/README.md b/templates/cloudflare/README.md
index 22cba04fe8f..ecb7e19d5a4 100644
--- a/templates/cloudflare/README.md
+++ b/templates/cloudflare/README.md
@@ -1,6 +1,6 @@
 # Welcome to Remix + Vite!
 
-📖 See the [Remix docs](https://remix.run/docs) and the [Remix Vite docs](https://remix.run/docs/en/main/future/vite) for details on supported features.
+📖 See the [Remix docs](https://remix.run/docs) and the [Remix Vite docs](https://remix.run/docs/en/main/guides/vite) for details on supported features.
 
 ## Typegen
 
diff --git a/templates/express/README.md b/templates/express/README.md
index ec619a8eb45..89422e2f556 100644
--- a/templates/express/README.md
+++ b/templates/express/README.md
@@ -1,6 +1,6 @@
 # Welcome to Remix + Vite!
 
-📖 See the [Remix docs](https://remix.run/docs) and the [Remix Vite docs](https://remix.run/docs/en/main/future/vite) for details on supported features.
+📖 See the [Remix docs](https://remix.run/docs) and the [Remix Vite docs](https://remix.run/docs/en/main/guides/vite) for details on supported features.
 
 ## Development
 
diff --git a/templates/remix-javascript/README.md b/templates/remix-javascript/README.md
index c05e097d923..6417d506d2f 100644
--- a/templates/remix-javascript/README.md
+++ b/templates/remix-javascript/README.md
@@ -1,6 +1,6 @@
 # Welcome to Remix + Vite!
 
-📖 See the [Remix docs](https://remix.run/docs) and the [Remix Vite docs](https://remix.run/docs/en/main/future/vite) for details on supported features.
+📖 See the [Remix docs](https://remix.run/docs) and the [Remix Vite docs](https://remix.run/docs/en/main/guides/vite) for details on supported features.
 
 ## Development
 
diff --git a/templates/remix/README.md b/templates/remix/README.md
index c05e097d923..6417d506d2f 100644
--- a/templates/remix/README.md
+++ b/templates/remix/README.md
@@ -1,6 +1,6 @@
 # Welcome to Remix + Vite!
 
-📖 See the [Remix docs](https://remix.run/docs) and the [Remix Vite docs](https://remix.run/docs/en/main/future/vite) for details on supported features.
+📖 See the [Remix docs](https://remix.run/docs) and the [Remix Vite docs](https://remix.run/docs/en/main/guides/vite) for details on supported features.
 
 ## Development
 
diff --git a/templates/spa/README.md b/templates/spa/README.md
index 033f096723a..b033ca4adbc 100644
--- a/templates/spa/README.md
+++ b/templates/spa/README.md
@@ -1,6 +1,6 @@
 # templates/spa
 
-This template leverages [Remix SPA Mode](https://remix.run/docs/en/main/future/spa-mode) and the [Remix Vite Plugin](https://remix.run/docs/en/main/future/vite) to build your app as a Single-Page Application using [Client Data](https://remix.run/docs/en/main/guides/client-data) for all of your data loads and mutations.
+This template leverages [Remix SPA Mode](https://remix.run/docs/en/main/guides/spa-mode) and the [Remix Vite Plugin](https://remix.run/docs/en/main/guides/vite) to build your app as a Single-Page Application using [Client Data](https://remix.run/docs/en/main/guides/client-data) for all of your data loads and mutations.
 
 ## Setup
 
diff --git a/templates/spa/app/routes/_index.tsx b/templates/spa/app/routes/_index.tsx
index 04198afc36e..a7884796d47 100644
--- a/templates/spa/app/routes/_index.tsx
+++ b/templates/spa/app/routes/_index.tsx
@@ -15,7 +15,7 @@ export default function Index() {
         <li>
           <a
             target="_blank"
-            href="https://remix.run/future/spa-mode"
+            href="https://remix.run/guides/spa-mode"
             rel="noreferrer"
           >
             SPA Mode Guide
diff --git a/templates/vite/README.md b/templates/vite/README.md
index c05e097d923..6417d506d2f 100644
--- a/templates/vite/README.md
+++ b/templates/vite/README.md
@@ -1,6 +1,6 @@
 # Welcome to Remix + Vite!
 
-📖 See the [Remix docs](https://remix.run/docs) and the [Remix Vite docs](https://remix.run/docs/en/main/future/vite) for details on supported features.
+📖 See the [Remix docs](https://remix.run/docs) and the [Remix Vite docs](https://remix.run/docs/en/main/guides/vite) for details on supported features.
 
 ## Development
 

From f3d1d8a18c04c973776b726f01d7b2353b581c45 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 1 Apr 2024 17:20:19 -0400
Subject: [PATCH 050/108] chore: Update version for release (pre) (#9177)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json                                      | 3 ++-
 .../helpers/vite-cloudflare-template/package.json        | 6 +++---
 packages/create-remix/CHANGELOG.md                       | 2 ++
 packages/create-remix/package.json                       | 2 +-
 packages/remix-architect/CHANGELOG.md                    | 7 +++++++
 packages/remix-architect/package.json                    | 2 +-
 packages/remix-cloudflare-pages/CHANGELOG.md             | 7 +++++++
 packages/remix-cloudflare-pages/package.json             | 2 +-
 packages/remix-cloudflare-workers/CHANGELOG.md           | 7 +++++++
 packages/remix-cloudflare-workers/package.json           | 2 +-
 packages/remix-cloudflare/CHANGELOG.md                   | 7 +++++++
 packages/remix-cloudflare/package.json                   | 2 +-
 packages/remix-css-bundle/CHANGELOG.md                   | 2 ++
 packages/remix-css-bundle/package.json                   | 2 +-
 packages/remix-deno/CHANGELOG.md                         | 7 +++++++
 packages/remix-deno/package.json                         | 2 +-
 packages/remix-dev/CHANGELOG.md                          | 9 +++++++++
 packages/remix-dev/package.json                          | 6 +++---
 packages/remix-eslint-config/CHANGELOG.md                | 2 ++
 packages/remix-eslint-config/package.json                | 2 +-
 packages/remix-express/CHANGELOG.md                      | 7 +++++++
 packages/remix-express/package.json                      | 2 +-
 packages/remix-node/CHANGELOG.md                         | 7 +++++++
 packages/remix-node/package.json                         | 2 +-
 packages/remix-react/CHANGELOG.md                        | 7 +++++++
 packages/remix-react/package.json                        | 2 +-
 packages/remix-serve/CHANGELOG.md                        | 8 ++++++++
 packages/remix-serve/package.json                        | 2 +-
 packages/remix-server-runtime/CHANGELOG.md               | 2 ++
 packages/remix-server-runtime/package.json               | 2 +-
 packages/remix-testing/CHANGELOG.md                      | 8 ++++++++
 packages/remix-testing/package.json                      | 2 +-
 packages/remix/package.json                              | 2 +-
 pnpm-lock.yaml                                           | 8 ++++----
 34 files changed, 116 insertions(+), 26 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index 89230eb7162..c390afbbc3d 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -37,6 +37,7 @@
     "single-fetch-client-loaders",
     "single-fetch-spa-mode",
     "single-fetch",
-    "spicy-ghosts-watch"
+    "spicy-ghosts-watch",
+    "update-docs"
   ]
 }
diff --git a/integration/helpers/vite-cloudflare-template/package.json b/integration/helpers/vite-cloudflare-template/package.json
index 1e676c59190..5d68766a80d 100644
--- a/integration/helpers/vite-cloudflare-template/package.json
+++ b/integration/helpers/vite-cloudflare-template/package.json
@@ -11,9 +11,9 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/cloudflare": "2.9.0-pre.1",
-    "@remix-run/cloudflare-pages": "2.9.0-pre.1",
-    "@remix-run/react": "2.9.0-pre.1",
+    "@remix-run/cloudflare": "2.9.0-pre.2",
+    "@remix-run/cloudflare-pages": "2.9.0-pre.2",
+    "@remix-run/react": "2.9.0-pre.2",
     "isbot": "^4.1.0",
     "miniflare": "^3.20231030.4",
     "react": "^18.2.0",
diff --git a/packages/create-remix/CHANGELOG.md b/packages/create-remix/CHANGELOG.md
index 0c39d33b073..367ceb81a6e 100644
--- a/packages/create-remix/CHANGELOG.md
+++ b/packages/create-remix/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `create-remix`
 
+## 2.9.0-pre.2
+
 ## 2.9.0-pre.1
 
 ## 2.9.0-pre.0
diff --git a/packages/create-remix/package.json b/packages/create-remix/package.json
index 5dc3caac4ec..52196888cdf 100644
--- a/packages/create-remix/package.json
+++ b/packages/create-remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-remix",
-  "version": "2.9.0-pre.1",
+  "version": "2.9.0-pre.2",
   "description": "Create a new Remix app",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix-architect/CHANGELOG.md b/packages/remix-architect/CHANGELOG.md
index bfb761cc1fd..24ac6484063 100644
--- a/packages/remix-architect/CHANGELOG.md
+++ b/packages/remix-architect/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/architect`
 
+## 2.9.0-pre.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.2`
+
 ## 2.9.0-pre.1
 
 ### Patch Changes
diff --git a/packages/remix-architect/package.json b/packages/remix-architect/package.json
index 5feb8b2685f..fb1d20718e6 100644
--- a/packages/remix-architect/package.json
+++ b/packages/remix-architect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/architect",
-  "version": "2.9.0-pre.1",
+  "version": "2.9.0-pre.2",
   "description": "Architect server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare-pages/CHANGELOG.md b/packages/remix-cloudflare-pages/CHANGELOG.md
index dc490abde4c..daffc533f15 100644
--- a/packages/remix-cloudflare-pages/CHANGELOG.md
+++ b/packages/remix-cloudflare-pages/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-pages`
 
+## 2.9.0-pre.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/cloudflare@2.9.0-pre.2`
+
 ## 2.9.0-pre.1
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare-pages/package.json b/packages/remix-cloudflare-pages/package.json
index bc99135e88d..b9a116e62b6 100644
--- a/packages/remix-cloudflare-pages/package.json
+++ b/packages/remix-cloudflare-pages/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-pages",
-  "version": "2.9.0-pre.1",
+  "version": "2.9.0-pre.2",
   "description": "Cloudflare Pages request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare-workers/CHANGELOG.md b/packages/remix-cloudflare-workers/CHANGELOG.md
index c62e219c3b5..59b4a411820 100644
--- a/packages/remix-cloudflare-workers/CHANGELOG.md
+++ b/packages/remix-cloudflare-workers/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-workers`
 
+## 2.9.0-pre.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/cloudflare@2.9.0-pre.2`
+
 ## 2.9.0-pre.1
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare-workers/package.json b/packages/remix-cloudflare-workers/package.json
index afb81f8abe2..d2756150745 100644
--- a/packages/remix-cloudflare-workers/package.json
+++ b/packages/remix-cloudflare-workers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-workers",
-  "version": "2.9.0-pre.1",
+  "version": "2.9.0-pre.2",
   "description": "Cloudflare worker request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare/CHANGELOG.md b/packages/remix-cloudflare/CHANGELOG.md
index bc266d91d14..6ee4df37075 100644
--- a/packages/remix-cloudflare/CHANGELOG.md
+++ b/packages/remix-cloudflare/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare`
 
+## 2.9.0-pre.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.2`
+
 ## 2.9.0-pre.1
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare/package.json b/packages/remix-cloudflare/package.json
index 84310e453a9..9075e35859d 100644
--- a/packages/remix-cloudflare/package.json
+++ b/packages/remix-cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare",
-  "version": "2.9.0-pre.1",
+  "version": "2.9.0-pre.2",
   "description": "Cloudflare platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-css-bundle/CHANGELOG.md b/packages/remix-css-bundle/CHANGELOG.md
index d02bd87d01e..034ee9b965b 100644
--- a/packages/remix-css-bundle/CHANGELOG.md
+++ b/packages/remix-css-bundle/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @remix-run/css-bundle
 
+## 2.9.0-pre.2
+
 ## 2.9.0-pre.1
 
 ## 2.9.0-pre.0
diff --git a/packages/remix-css-bundle/package.json b/packages/remix-css-bundle/package.json
index 70dfbb44d97..5974d24a495 100644
--- a/packages/remix-css-bundle/package.json
+++ b/packages/remix-css-bundle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/css-bundle",
-  "version": "2.9.0-pre.1",
+  "version": "2.9.0-pre.2",
   "description": "CSS bundle href when using CSS bundling features in Remix",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix-deno/CHANGELOG.md b/packages/remix-deno/CHANGELOG.md
index 341c9a5f3fa..96d35ccda8d 100644
--- a/packages/remix-deno/CHANGELOG.md
+++ b/packages/remix-deno/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/deno`
 
+## 2.9.0-pre.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.2`
+
 ## 2.9.0-pre.1
 
 ### Patch Changes
diff --git a/packages/remix-deno/package.json b/packages/remix-deno/package.json
index c35db368ed6..b75abf50996 100644
--- a/packages/remix-deno/package.json
+++ b/packages/remix-deno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/deno",
-  "version": "2.9.0-pre.1",
+  "version": "2.9.0-pre.2",
   "description": "Deno platform abstractions for Remix",
   "homepage": "https://remix.run",
   "main": "./index.ts",
diff --git a/packages/remix-dev/CHANGELOG.md b/packages/remix-dev/CHANGELOG.md
index fbd441ae9be..1cac39088c5 100644
--- a/packages/remix-dev/CHANGELOG.md
+++ b/packages/remix-dev/CHANGELOG.md
@@ -1,5 +1,14 @@
 # `@remix-run/dev`
 
+## 2.9.0-pre.2
+
+### Patch Changes
+
+- Update links printed to the console by the Remix CLI/Dev Server to point to updated docs locations ([#9176](https://github.com/remix-run/remix/pull/9176))
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.2`
+  - `@remix-run/server-runtime@2.9.0-pre.2`
+
 ## 2.9.0-pre.1
 
 ### Patch Changes
diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json
index 0fbccc13e9a..5a5a876fa92 100644
--- a/packages/remix-dev/package.json
+++ b/packages/remix-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/dev",
-  "version": "2.9.0-pre.1",
+  "version": "2.9.0-pre.2",
   "description": "Dev tools and CLI for Remix",
   "homepage": "https://remix.run",
   "bugs": {
@@ -106,8 +106,8 @@
     "wrangler": "^3.28.2"
   },
   "peerDependencies": {
-    "@remix-run/react": "^2.9.0-pre.1",
-    "@remix-run/serve": "^2.9.0-pre.1",
+    "@remix-run/react": "^2.9.0-pre.2",
+    "@remix-run/serve": "^2.9.0-pre.2",
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2"
diff --git a/packages/remix-eslint-config/CHANGELOG.md b/packages/remix-eslint-config/CHANGELOG.md
index 03563bee65e..4e20210c408 100644
--- a/packages/remix-eslint-config/CHANGELOG.md
+++ b/packages/remix-eslint-config/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `@remix-run/eslint-config`
 
+## 2.9.0-pre.2
+
 ## 2.9.0-pre.1
 
 ## 2.9.0-pre.0
diff --git a/packages/remix-eslint-config/package.json b/packages/remix-eslint-config/package.json
index 499f0cb7dd6..66c324cfda7 100644
--- a/packages/remix-eslint-config/package.json
+++ b/packages/remix-eslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/eslint-config",
-  "version": "2.9.0-pre.1",
+  "version": "2.9.0-pre.2",
   "description": "ESLint configuration for Remix projects",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-express/CHANGELOG.md b/packages/remix-express/CHANGELOG.md
index 13e615802db..4364a335e6f 100644
--- a/packages/remix-express/CHANGELOG.md
+++ b/packages/remix-express/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/express`
 
+## 2.9.0-pre.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.2`
+
 ## 2.9.0-pre.1
 
 ### Patch Changes
diff --git a/packages/remix-express/package.json b/packages/remix-express/package.json
index 446fdebfd54..d1dd74be65e 100644
--- a/packages/remix-express/package.json
+++ b/packages/remix-express/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/express",
-  "version": "2.9.0-pre.1",
+  "version": "2.9.0-pre.2",
   "description": "Express server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-node/CHANGELOG.md b/packages/remix-node/CHANGELOG.md
index 22cd0352eb6..d81ba2719cf 100644
--- a/packages/remix-node/CHANGELOG.md
+++ b/packages/remix-node/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/node`
 
+## 2.9.0-pre.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.2`
+
 ## 2.9.0-pre.1
 
 ### Patch Changes
diff --git a/packages/remix-node/package.json b/packages/remix-node/package.json
index 82564f0d444..629c4c269f4 100644
--- a/packages/remix-node/package.json
+++ b/packages/remix-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/node",
-  "version": "2.9.0-pre.1",
+  "version": "2.9.0-pre.2",
   "description": "Node.js platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-react/CHANGELOG.md b/packages/remix-react/CHANGELOG.md
index 4209535272a..5364d66c93a 100644
--- a/packages/remix-react/CHANGELOG.md
+++ b/packages/remix-react/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/react`
 
+## 2.9.0-pre.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.2`
+
 ## 2.9.0-pre.1
 
 ### Patch Changes
diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json
index c841c0d1498..8412e1c6d51 100644
--- a/packages/remix-react/package.json
+++ b/packages/remix-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/react",
-  "version": "2.9.0-pre.1",
+  "version": "2.9.0-pre.2",
   "description": "React DOM bindings for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-serve/CHANGELOG.md b/packages/remix-serve/CHANGELOG.md
index d7f78159719..57d5d1b9dfd 100644
--- a/packages/remix-serve/CHANGELOG.md
+++ b/packages/remix-serve/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/serve`
 
+## 2.9.0-pre.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/express@2.9.0-pre.2`
+  - `@remix-run/node@2.9.0-pre.2`
+
 ## 2.9.0-pre.1
 
 ### Patch Changes
diff --git a/packages/remix-serve/package.json b/packages/remix-serve/package.json
index 982be060d59..130bac2bad3 100644
--- a/packages/remix-serve/package.json
+++ b/packages/remix-serve/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/serve",
-  "version": "2.9.0-pre.1",
+  "version": "2.9.0-pre.2",
   "description": "Production application server for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-server-runtime/CHANGELOG.md b/packages/remix-server-runtime/CHANGELOG.md
index 039c22632bb..cca98ebc9bb 100644
--- a/packages/remix-server-runtime/CHANGELOG.md
+++ b/packages/remix-server-runtime/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `@remix-run/server-runtime`
 
+## 2.9.0-pre.2
+
 ## 2.9.0-pre.1
 
 ### Patch Changes
diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json
index b6826e15ee9..4c22b9ee198 100644
--- a/packages/remix-server-runtime/package.json
+++ b/packages/remix-server-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/server-runtime",
-  "version": "2.9.0-pre.1",
+  "version": "2.9.0-pre.2",
   "description": "Server runtime for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-testing/CHANGELOG.md b/packages/remix-testing/CHANGELOG.md
index 88237bf8606..2cc50090dbc 100644
--- a/packages/remix-testing/CHANGELOG.md
+++ b/packages/remix-testing/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/testing`
 
+## 2.9.0-pre.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.2`
+  - `@remix-run/react@2.9.0-pre.2`
+
 ## 2.9.0-pre.1
 
 ### Patch Changes
diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
index 01370cd927f..c6e96fab0c5 100644
--- a/packages/remix-testing/package.json
+++ b/packages/remix-testing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/testing",
-  "version": "2.9.0-pre.1",
+  "version": "2.9.0-pre.2",
   "description": "Testing utilities for Remix apps",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix/package.json b/packages/remix/package.json
index baa42eafe62..a6f5b846328 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "remix",
-  "version": "2.9.0-pre.1",
+  "version": "2.9.0-pre.2",
   "description": "A framework for building better websites",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7592ff36708..45b44141300 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -545,13 +545,13 @@ importers:
   integration/helpers/vite-cloudflare-template:
     dependencies:
       '@remix-run/cloudflare':
-        specifier: 2.9.0-pre.1
+        specifier: 2.9.0-pre.2
         version: link:../../../packages/remix-cloudflare
       '@remix-run/cloudflare-pages':
-        specifier: 2.9.0-pre.1
+        specifier: 2.9.0-pre.2
         version: link:../../../packages/remix-cloudflare-pages
       '@remix-run/react':
-        specifier: 2.9.0-pre.1
+        specifier: 2.9.0-pre.2
         version: link:../../../packages/remix-react
       isbot:
         specifier: ^4.1.0
@@ -865,7 +865,7 @@ importers:
         specifier: workspace:*
         version: link:../remix-node
       '@remix-run/react':
-        specifier: ^2.9.0-pre.1
+        specifier: ^2.9.0-pre.2
         version: link:../remix-react
       '@remix-run/router':
         specifier: 1.16.0-pre.1

From b0af4f81e3cdc5929d28994dc42e6a34d0989f57 Mon Sep 17 00:00:00 2001
From: Eric Burel <eb@lbke.fr>
Date: Tue, 2 Apr 2024 15:34:31 +0200
Subject: [PATCH 051/108] Update use-params.md (#9163)

Co-authored-by: Matt Brophy <matt@brophy.org>
---
 contributors.yml         | 1 +
 docs/hooks/use-params.md | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/contributors.yml b/contributors.yml
index 2de71e7751c..23a5a9c13c9 100644
--- a/contributors.yml
+++ b/contributors.yml
@@ -175,6 +175,7 @@
 - emzoumpo
 - enbonnet
 - eps1lon
+- eric-burel
 - ericchernuka
 - esamattis
 - evanwinter
diff --git a/docs/hooks/use-params.md b/docs/hooks/use-params.md
index 7d3c9b63c61..afc5b94a720 100644
--- a/docs/hooks/use-params.md
+++ b/docs/hooks/use-params.md
@@ -15,4 +15,6 @@ function SomeComponent() {
 }
 ```
 
-Assuming a route like `routes/posts/$postId.tsx` is matched by `/posts/123` then `params.postId` will be `"123"`.
+Assuming a route like `routes/posts/$postId.tsx` is matched by `/posts/123` then `params.postId` will be `"123"`. Params for [splat routes][splat-routes] are available as `params["*"]`.
+
+[splat-params]: ../file-conventions/routes#splat-routes

From ea9fa523dd203124d71591df004db322884d05a5 Mon Sep 17 00:00:00 2001
From: Remix Run Bot <hello@remix.run>
Date: Tue, 2 Apr 2024 13:36:09 +0000
Subject: [PATCH 052/108] chore: format

---
 docs/hooks/use-params.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/hooks/use-params.md b/docs/hooks/use-params.md
index afc5b94a720..c97528658e4 100644
--- a/docs/hooks/use-params.md
+++ b/docs/hooks/use-params.md
@@ -15,6 +15,6 @@ function SomeComponent() {
 }
 ```
 
-Assuming a route like `routes/posts/$postId.tsx` is matched by `/posts/123` then `params.postId` will be `"123"`. Params for [splat routes][splat-routes] are available as `params["*"]`.
+Assuming a route like `routes/posts/$postId.tsx` is matched by `/posts/123` then `params.postId` will be `"123"`. Params for \[splat routes]\[splat-routes] are available as `params["*"]`.
 
 [splat-params]: ../file-conventions/routes#splat-routes

From f9372aeeff0c7af29f6a1a6d261ccc20f781d479 Mon Sep 17 00:00:00 2001
From: Brooks Lybrand <brookslybrand@gmail.com>
Date: Tue, 2 Apr 2024 08:47:09 -0500
Subject: [PATCH 053/108] docs: fix typo in changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bef9395aade..dc1399c1645 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -185,7 +185,7 @@ Date: 2024-04-03
 
 #### Undici
 
-Wih Remix `2.9.0`, we have switched the underlying [Web Fetch](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API) polyfills to use the [`undici`](https://github.com/nodejs/undici) package. This change has a few primary benefits:
+With Remix `2.9.0`, we have switched the underlying [Web Fetch](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API) polyfills to use the [`undici`](https://github.com/nodejs/undici) package. This change has a few primary benefits:
 
 - It allows us to stop maintaining our own [web-std-io fork](https://github.com/remix-run/web-std-io)
 - It should bring us more in-line with spec compliance

From b07921efd5e8eed98e2996749852777c71bc3e50 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Tue, 2 Apr 2024 09:55:23 -0400
Subject: [PATCH 054/108] Fix markdown link

---
 docs/hooks/use-params.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/hooks/use-params.md b/docs/hooks/use-params.md
index c97528658e4..94b02e7179d 100644
--- a/docs/hooks/use-params.md
+++ b/docs/hooks/use-params.md
@@ -15,6 +15,6 @@ function SomeComponent() {
 }
 ```
 
-Assuming a route like `routes/posts/$postId.tsx` is matched by `/posts/123` then `params.postId` will be `"123"`. Params for \[splat routes]\[splat-routes] are available as `params["*"]`.
+Assuming a route like `routes/posts/$postId.tsx` is matched by `/posts/123` then `params.postId` will be `"123"`. Params for [splat routes][splat-routes] are available as `params["*"]`.
 
-[splat-params]: ../file-conventions/routes#splat-routes
+[splat-routes]: ../file-conventions/routes#splat-routes

From 0c0e4955f8fb1e9c4388e4f24195aa38b16dfafc Mon Sep 17 00:00:00 2001
From: Fran Dios <fran.dios@shopify.com>
Date: Wed, 3 Apr 2024 23:18:33 +0200
Subject: [PATCH 055/108] Fix Vite critical CSS resolution for route files with
 absolute paths (#9194)

---
 .changeset/hot-suits-jam.md       | 5 +++++
 packages/remix-dev/vite/styles.ts | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/hot-suits-jam.md

diff --git a/.changeset/hot-suits-jam.md b/.changeset/hot-suits-jam.md
new file mode 100644
index 00000000000..41b040eb851
--- /dev/null
+++ b/.changeset/hot-suits-jam.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/dev": patch
+---
+
+Vite: Fix issue resolving critical CSS during development when route files are located outside of the app directory.
diff --git a/packages/remix-dev/vite/styles.ts b/packages/remix-dev/vite/styles.ts
index 9996afa1b46..f85b71e8b19 100644
--- a/packages/remix-dev/vite/styles.ts
+++ b/packages/remix-dev/vite/styles.ts
@@ -198,7 +198,7 @@ export const getStylesForUrl = async ({
   let appPath = path.relative(process.cwd(), remixConfig.appDirectory);
   let documentRouteFiles =
     matchRoutes(routes, url, build.basename)?.map((match) =>
-      path.join(appPath, remixConfig.routes[match.route.id].file)
+      path.resolve(appPath, remixConfig.routes[match.route.id].file)
     ) ?? [];
 
   let styles = await getStylesForFiles({

From 89eb3cf95078bfea2262cc6ad5839783b4b9e477 Mon Sep 17 00:00:00 2001
From: Jacob Ebey <jacob.ebey@live.com>
Date: Thu, 4 Apr 2024 12:03:18 -0700
Subject: [PATCH 056/108] chore(remix-node): put native fetch behind config
 option (#9198)

Co-authored-by: Matt Brophy <matt@brophy.org>
---
 .changeset/good-buses-divide.md               |  9 +++
 integration/error-data-request-test.ts        |  4 +-
 integration/helpers/create-fixture.ts         |  3 +-
 integration/helpers/vite.ts                   |  2 +-
 integration/hmr-test.ts                       |  2 +-
 integration/vite-basename-test.ts             |  4 +-
 package.json                                  |  1 +
 packages/remix-architect/__tests__/setup.ts   |  2 +-
 packages/remix-express/__tests__/setup.ts     |  2 +-
 packages/remix-node/__tests__/setup.ts        |  2 +-
 packages/remix-node/globals.ts                | 56 +++++++++++--------
 packages/remix-node/package.json              |  1 +
 packages/remix-node/rollup.config.js          |  2 +
 packages/remix-react/__tests__/setup.ts       |  2 +-
 packages/remix-serve/cli.ts                   |  3 +-
 .../remix-server-runtime/__tests__/setup.ts   |  2 +-
 packages/remix-testing/jest.config.js         |  2 +-
 packages/remix-testing/jest.setup.js          |  2 +-
 pnpm-lock.yaml                                | 32 +++++++++++
 .../classic-remix-compiler/arc/server.ts      |  2 +-
 20 files changed, 96 insertions(+), 39 deletions(-)
 create mode 100644 .changeset/good-buses-divide.md

diff --git a/.changeset/good-buses-divide.md b/.changeset/good-buses-divide.md
new file mode 100644
index 00000000000..913eb1bc877
--- /dev/null
+++ b/.changeset/good-buses-divide.md
@@ -0,0 +1,9 @@
+---
+"@remix-run/node": patch
+"@remix-run/serve": patch
+---
+
+- Put `undici` fetch polyfill behind a new `installGlobals({ nativeFetch: true })` parameter
+- `remix-serve` will default to using `undici` for the fetch polyfill if `future._unstable_singleFetch` is enabled because the single fetch implementation relies on the `undici` polyfill
+  - Any users opting into Single Fetch and managing their own polfill will need to pass the flag to `installGlobals` on their own to avoid runtime errors with Single Fetch
+
diff --git a/integration/error-data-request-test.ts b/integration/error-data-request-test.ts
index b19e8cea4f2..714c328bde8 100644
--- a/integration/error-data-request-test.ts
+++ b/integration/error-data-request-test.ts
@@ -327,9 +327,7 @@ test.describe("single fetch", () => {
         fixture.requestSingleFetchData("/loader-return-json.data", {
           method: "TRACE",
         })
-      ).rejects.toThrowError(
-        `Failed to construct 'Request': 'TRACE' HTTP method is unsupported.`
-      );
+      ).rejects.toThrow(/'TRACE' HTTP method is unsupported\./);
     });
 
     test("returns a 404 on a data fetch to a path with no matches", async () => {
diff --git a/integration/helpers/create-fixture.ts b/integration/helpers/create-fixture.ts
index 78be4f2294f..a0631874bd1 100644
--- a/integration/helpers/create-fixture.ts
+++ b/integration/helpers/create-fixture.ts
@@ -44,8 +44,9 @@ export function json(value: JsonObject) {
 }
 
 export async function createFixture(init: FixtureInit, mode?: ServerMode) {
-  installGlobals();
+  installGlobals({ nativeFetch: true });
   let compiler = init.compiler ?? "remix";
+
   let projectDir = await createFixtureProject(init, mode);
   let buildPath = url.pathToFileURL(
     path.join(
diff --git a/integration/helpers/vite.ts b/integration/helpers/vite.ts
index 0216d50f59d..65c805288ff 100644
--- a/integration/helpers/vite.ts
+++ b/integration/helpers/vite.ts
@@ -53,7 +53,7 @@ export const EXPRESS_SERVER = (args: {
     import { installGlobals } from "@remix-run/node";
     import express from "express";
 
-    installGlobals();
+    installGlobals({ nativeFetch: true });
 
     let viteDevServer =
       process.env.NODE_ENV === "production"
diff --git a/integration/hmr-test.ts b/integration/hmr-test.ts
index 159b404341c..a2f5f2ad2a3 100644
--- a/integration/hmr-test.ts
+++ b/integration/hmr-test.ts
@@ -180,7 +180,7 @@ let customServer = (options: { appPort: number; devReady: string }) => {
       import { createRequestHandler } from "@remix-run/express";
       import { ${options.devReady}, installGlobals } from "@remix-run/node";
 
-      installGlobals();
+      installGlobals({ nativeFetch: true });
 
       const app = express();
       app.use(express.static("public", { immutable: true, maxAge: "1y" }));
diff --git a/integration/vite-basename-test.ts b/integration/vite-basename-test.ts
index 115a653cc50..9c0ceb8690d 100644
--- a/integration/vite-basename-test.ts
+++ b/integration/vite-basename-test.ts
@@ -97,7 +97,7 @@ const customServerFile = ({
     import { createRequestHandler } from "@remix-run/express";
     import { installGlobals } from "@remix-run/node";
     import express from "express";
-    installGlobals();
+    installGlobals({ nativeFetch: true });
 
     const viteDevServer =
       process.env.NODE_ENV === "production"
@@ -416,7 +416,7 @@ test.describe("Vite base / Remix basename / express build", async () => {
         import { createRequestHandler } from "@remix-run/express";
         import { installGlobals } from "@remix-run/node";
         import express from "express";
-        installGlobals();
+        installGlobals({ nativeFetch: true });
 
         const app = express();
         app.all(
diff --git a/package.json b/package.json
index 8d563372985..9ce4b79c709 100644
--- a/package.json
+++ b/package.json
@@ -64,6 +64,7 @@
     "@remix-run/react": "workspace:*",
     "@remix-run/testing": "workspace:*",
     "@rollup/plugin-babel": "^5.2.2",
+    "@rollup/plugin-commonjs": "^21.1.0",
     "@rollup/plugin-json": "^5.0.0",
     "@rollup/plugin-node-resolve": "^11.0.1",
     "@rollup/plugin-replace": "^5.0.2",
diff --git a/packages/remix-architect/__tests__/setup.ts b/packages/remix-architect/__tests__/setup.ts
index 917305ac938..01b7b7e57b9 100644
--- a/packages/remix-architect/__tests__/setup.ts
+++ b/packages/remix-architect/__tests__/setup.ts
@@ -1,2 +1,2 @@
 import { installGlobals } from "@remix-run/node";
-installGlobals();
+installGlobals({ nativeFetch: true });
diff --git a/packages/remix-express/__tests__/setup.ts b/packages/remix-express/__tests__/setup.ts
index 917305ac938..01b7b7e57b9 100644
--- a/packages/remix-express/__tests__/setup.ts
+++ b/packages/remix-express/__tests__/setup.ts
@@ -1,2 +1,2 @@
 import { installGlobals } from "@remix-run/node";
-installGlobals();
+installGlobals({ nativeFetch: true });
diff --git a/packages/remix-node/__tests__/setup.ts b/packages/remix-node/__tests__/setup.ts
index 917305ac938..01b7b7e57b9 100644
--- a/packages/remix-node/__tests__/setup.ts
+++ b/packages/remix-node/__tests__/setup.ts
@@ -1,2 +1,2 @@
 import { installGlobals } from "@remix-run/node";
-installGlobals();
+installGlobals({ nativeFetch: true });
diff --git a/packages/remix-node/globals.ts b/packages/remix-node/globals.ts
index 2ae3f0daa57..c16012da783 100644
--- a/packages/remix-node/globals.ts
+++ b/packages/remix-node/globals.ts
@@ -1,12 +1,3 @@
-import {
-  File as NodeFile,
-  fetch as nodeFetch,
-  FormData as NodeFormData,
-  Headers as NodeHeaders,
-  Request as NodeRequest,
-  Response as NodeResponse,
-} from "undici";
-
 declare global {
   namespace NodeJS {
     interface ProcessEnv {
@@ -32,17 +23,38 @@ declare global {
   }
 }
 
-export function installGlobals() {
-  global.File = NodeFile as unknown as typeof File;
-
-  // @ts-expect-error - overriding globals
-  global.Headers = NodeHeaders;
-  // @ts-expect-error - overriding globals
-  global.Request = NodeRequest;
-  // @ts-expect-error - overriding globals
-  global.Response = NodeResponse;
-  // @ts-expect-error - overriding globals
-  global.fetch = nodeFetch;
-  // @ts-expect-error - overriding globals
-  global.FormData = NodeFormData;
+export function installGlobals({
+  nativeFetch,
+}: { nativeFetch?: boolean } = {}) {
+  if (nativeFetch) {
+    let {
+      File: UndiciFile,
+      fetch: undiciFetch,
+      FormData: UndiciFormData,
+      Headers: UndiciHeaders,
+      Request: UndiciRequest,
+      Response: UndiciResponse,
+    } = require("undici");
+    global.File = UndiciFile as unknown as typeof File;
+    global.Headers = UndiciHeaders;
+    global.Request = UndiciRequest;
+    global.Response = UndiciResponse;
+    global.fetch = undiciFetch;
+    global.FormData = UndiciFormData;
+  } else {
+    let {
+      File: RemixFile,
+      fetch: RemixFetch,
+      FormData: RemixFormData,
+      Headers: RemixHeaders,
+      Request: RemixRequest,
+      Response: RemixResponse,
+    } = require("@remix-run/web-fetch");
+    global.File = RemixFile;
+    global.Headers = RemixHeaders;
+    global.Request = RemixRequest;
+    global.Response = RemixResponse;
+    global.fetch = RemixFetch;
+    global.FormData = RemixFormData;
+  }
 }
diff --git a/packages/remix-node/package.json b/packages/remix-node/package.json
index 629c4c269f4..a46308f4b72 100644
--- a/packages/remix-node/package.json
+++ b/packages/remix-node/package.json
@@ -21,6 +21,7 @@
   },
   "dependencies": {
     "@remix-run/server-runtime": "workspace:*",
+    "@remix-run/web-fetch": "^4.4.2",
     "@web3-storage/multipart-parser": "^1.0.0",
     "cookie-signature": "^1.1.0",
     "source-map-support": "^0.5.21",
diff --git a/packages/remix-node/rollup.config.js b/packages/remix-node/rollup.config.js
index f61aa0306c0..55e36856248 100644
--- a/packages/remix-node/rollup.config.js
+++ b/packages/remix-node/rollup.config.js
@@ -1,5 +1,6 @@
 const path = require("node:path");
 const babel = require("@rollup/plugin-babel").default;
+const commonjs = require("@rollup/plugin-commonjs");
 const nodeResolve = require("@rollup/plugin-node-resolve").default;
 const copy = require("rollup-plugin-copy");
 
@@ -37,6 +38,7 @@ module.exports = function rollup() {
           extensions: [".ts", ".tsx"],
         }),
         nodeResolve({ extensions: [".ts", ".tsx"] }),
+        commonjs({ ignoreDynamicRequires: true }),
         copy({
           targets: [
             { src: "LICENSE.md", dest: [outputDir, sourceDir] },
diff --git a/packages/remix-react/__tests__/setup.ts b/packages/remix-react/__tests__/setup.ts
index 87f5cefb48f..dab603502ce 100644
--- a/packages/remix-react/__tests__/setup.ts
+++ b/packages/remix-react/__tests__/setup.ts
@@ -4,5 +4,5 @@ global.TextEncoder = require("util").TextEncoder;
 global.ReadableStream = require("stream/web").ReadableStream;
 global.WritableStream = require("stream/web").WritableStream;
 
-require("@remix-run/node").installGlobals();
+require("@remix-run/node").installGlobals({ nativeFetch: true });
 global.FormData = JSDOMFormData;
diff --git a/packages/remix-serve/cli.ts b/packages/remix-serve/cli.ts
index 31c8b765087..6bf903e157e 100644
--- a/packages/remix-serve/cli.ts
+++ b/packages/remix-serve/cli.ts
@@ -34,7 +34,6 @@ sourceMapSupport.install({
     return null;
   },
 });
-installGlobals();
 
 run();
 
@@ -101,6 +100,8 @@ async function run() {
 
   let build: ServerBuild = await reimportServer();
 
+  installGlobals({ nativeFetch: build.future.unstable_singleFetch });
+
   let onListen = () => {
     let address =
       process.env.HOST ||
diff --git a/packages/remix-server-runtime/__tests__/setup.ts b/packages/remix-server-runtime/__tests__/setup.ts
index 451031301ac..2752bf1a72d 100644
--- a/packages/remix-server-runtime/__tests__/setup.ts
+++ b/packages/remix-server-runtime/__tests__/setup.ts
@@ -1,3 +1,3 @@
 import { installGlobals } from "@remix-run/node";
 
-installGlobals();
+installGlobals({ nativeFetch: true });
diff --git a/packages/remix-testing/jest.config.js b/packages/remix-testing/jest.config.js
index 483aa32c42d..c5d645167a2 100644
--- a/packages/remix-testing/jest.config.js
+++ b/packages/remix-testing/jest.config.js
@@ -4,5 +4,5 @@ module.exports = {
   displayName: "testing",
   setupFiles: [],
   testEnvironment: "jsdom",
-  setupFilesAfterEnv: ["@testing-library/jest-dom", "./jest.setup.js"],
+  setupFilesAfterEnv: ["./jest.setup.js", "@testing-library/jest-dom"],
 };
diff --git a/packages/remix-testing/jest.setup.js b/packages/remix-testing/jest.setup.js
index 87f5cefb48f..dab603502ce 100644
--- a/packages/remix-testing/jest.setup.js
+++ b/packages/remix-testing/jest.setup.js
@@ -4,5 +4,5 @@ global.TextEncoder = require("util").TextEncoder;
 global.ReadableStream = require("stream/web").ReadableStream;
 global.WritableStream = require("stream/web").WritableStream;
 
-require("@remix-run/node").installGlobals();
+require("@remix-run/node").installGlobals({ nativeFetch: true });
 global.FormData = JSDOMFormData;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 45b44141300..e1ba8025df1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -94,6 +94,9 @@ importers:
       '@rollup/plugin-babel':
         specifier: ^5.2.2
         version: 5.3.1(@babel/core@7.23.7)(rollup@2.75.7)
+      '@rollup/plugin-commonjs':
+        specifier: ^21.1.0
+        version: 21.1.0(rollup@2.75.7)
       '@rollup/plugin-json':
         specifier: ^5.0.0
         version: 5.0.2(rollup@2.75.7)
@@ -1182,6 +1185,9 @@ importers:
       '@remix-run/server-runtime':
         specifier: workspace:*
         version: link:../remix-server-runtime
+      '@remix-run/web-fetch':
+        specifier: ^4.4.2
+        version: 4.4.2
       '@web3-storage/multipart-parser':
         specifier: ^1.0.0
         version: 1.0.0
@@ -4254,6 +4260,22 @@ packages:
       rollup: 2.75.7
     dev: false
 
+  /@rollup/plugin-commonjs@21.1.0(rollup@2.75.7):
+    resolution: {integrity: sha512-6ZtHx3VHIp2ReNNDxHjuUml6ur+WcQ28N1yHgCQwsbNkQg2suhxGMDQGJOn/KuDxKtd1xuZP5xSTwBA4GQ8hbA==}
+    engines: {node: '>= 8.0.0'}
+    peerDependencies:
+      rollup: ^2.38.3
+    dependencies:
+      '@rollup/pluginutils': 3.1.0(rollup@2.75.7)
+      commondir: 1.0.1
+      estree-walker: 2.0.2
+      glob: 7.2.0
+      is-reference: 1.2.1
+      magic-string: 0.25.9
+      resolve: 1.22.8
+      rollup: 2.75.7
+    dev: false
+
   /@rollup/plugin-json@5.0.2(rollup@2.75.7):
     resolution: {integrity: sha512-D1CoOT2wPvadWLhVcmpkDnesTzjhNIQRWLsc3fA49IFOP2Y84cFOOJ+nKGYedvXHKUsPeq07HR4hXpBBr+CHlA==}
     engines: {node: '>=14.0.0'}
@@ -6514,6 +6536,10 @@ packages:
     engines: {node: '>=4.0.0'}
     dev: false
 
+  /commondir@1.0.1:
+    resolution: {integrity: sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==}
+    dev: false
+
   /component-emitter@1.3.0:
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
 
@@ -9331,6 +9357,12 @@ packages:
     resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==}
     dev: true
 
+  /is-reference@1.2.1:
+    resolution: {integrity: sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==}
+    dependencies:
+      '@types/estree': 1.0.0
+    dev: false
+
   /is-reference@3.0.0:
     resolution: {integrity: sha512-Eo1W3wUoHWoCoVM4GVl/a+K0IgiqE5aIo4kJABFyMum1ZORlPkC+UC357sSQUL5w5QCE5kCC9upl75b7+7CY/Q==}
     dependencies:
diff --git a/templates/classic-remix-compiler/arc/server.ts b/templates/classic-remix-compiler/arc/server.ts
index 4db5dcdece6..90b5192011d 100644
--- a/templates/classic-remix-compiler/arc/server.ts
+++ b/templates/classic-remix-compiler/arc/server.ts
@@ -4,6 +4,6 @@ import { installGlobals } from "@remix-run/node";
 import sourceMapSupport from "source-map-support";
 
 sourceMapSupport.install();
-installGlobals();
+installGlobals({ nativeFetch: true });
 
 export const handler = createRequestHandler({ build });

From 8d151a51213d840f9179fc00cde96dc1a2b51e30 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 4 Apr 2024 12:16:16 -0700
Subject: [PATCH 057/108] chore: Update version for release (pre) (#9199)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json                                   |  1 +
 .../helpers/vite-cloudflare-template/package.json     |  6 +++---
 packages/create-remix/CHANGELOG.md                    |  2 ++
 packages/create-remix/package.json                    |  2 +-
 packages/remix-architect/CHANGELOG.md                 |  7 +++++++
 packages/remix-architect/package.json                 |  2 +-
 packages/remix-cloudflare-pages/CHANGELOG.md          |  7 +++++++
 packages/remix-cloudflare-pages/package.json          |  2 +-
 packages/remix-cloudflare-workers/CHANGELOG.md        |  7 +++++++
 packages/remix-cloudflare-workers/package.json        |  2 +-
 packages/remix-cloudflare/CHANGELOG.md                |  7 +++++++
 packages/remix-cloudflare/package.json                |  2 +-
 packages/remix-css-bundle/CHANGELOG.md                |  2 ++
 packages/remix-css-bundle/package.json                |  2 +-
 packages/remix-deno/CHANGELOG.md                      |  7 +++++++
 packages/remix-deno/package.json                      |  2 +-
 packages/remix-dev/CHANGELOG.md                       |  8 ++++++++
 packages/remix-dev/package.json                       |  6 +++---
 packages/remix-eslint-config/CHANGELOG.md             |  2 ++
 packages/remix-eslint-config/package.json             |  2 +-
 packages/remix-express/CHANGELOG.md                   |  7 +++++++
 packages/remix-express/package.json                   |  2 +-
 packages/remix-node/CHANGELOG.md                      | 10 ++++++++++
 packages/remix-node/package.json                      |  2 +-
 packages/remix-react/CHANGELOG.md                     |  7 +++++++
 packages/remix-react/package.json                     |  2 +-
 packages/remix-serve/CHANGELOG.md                     | 11 +++++++++++
 packages/remix-serve/package.json                     |  2 +-
 packages/remix-server-runtime/CHANGELOG.md            |  2 ++
 packages/remix-server-runtime/package.json            |  2 +-
 packages/remix-testing/CHANGELOG.md                   |  8 ++++++++
 packages/remix-testing/package.json                   |  2 +-
 packages/remix/package.json                           |  2 +-
 pnpm-lock.yaml                                        |  8 ++++----
 34 files changed, 120 insertions(+), 25 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index c390afbbc3d..bdcac8f7960 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -28,6 +28,7 @@
   "changesets": [
     "brave-cars-approve",
     "curvy-seahorses-jog",
+    "good-buses-divide",
     "heavy-steaks-remember",
     "honest-geese-chew",
     "odd-frogs-attend",
diff --git a/integration/helpers/vite-cloudflare-template/package.json b/integration/helpers/vite-cloudflare-template/package.json
index 5d68766a80d..e00f05d3bae 100644
--- a/integration/helpers/vite-cloudflare-template/package.json
+++ b/integration/helpers/vite-cloudflare-template/package.json
@@ -11,9 +11,9 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/cloudflare": "2.9.0-pre.2",
-    "@remix-run/cloudflare-pages": "2.9.0-pre.2",
-    "@remix-run/react": "2.9.0-pre.2",
+    "@remix-run/cloudflare": "2.9.0-pre.3",
+    "@remix-run/cloudflare-pages": "2.9.0-pre.3",
+    "@remix-run/react": "2.9.0-pre.3",
     "isbot": "^4.1.0",
     "miniflare": "^3.20231030.4",
     "react": "^18.2.0",
diff --git a/packages/create-remix/CHANGELOG.md b/packages/create-remix/CHANGELOG.md
index 367ceb81a6e..24ad6c6187d 100644
--- a/packages/create-remix/CHANGELOG.md
+++ b/packages/create-remix/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `create-remix`
 
+## 2.9.0-pre.3
+
 ## 2.9.0-pre.2
 
 ## 2.9.0-pre.1
diff --git a/packages/create-remix/package.json b/packages/create-remix/package.json
index 52196888cdf..36974ce5839 100644
--- a/packages/create-remix/package.json
+++ b/packages/create-remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-remix",
-  "version": "2.9.0-pre.2",
+  "version": "2.9.0-pre.3",
   "description": "Create a new Remix app",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix-architect/CHANGELOG.md b/packages/remix-architect/CHANGELOG.md
index 24ac6484063..7f293884b34 100644
--- a/packages/remix-architect/CHANGELOG.md
+++ b/packages/remix-architect/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/architect`
 
+## 2.9.0-pre.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.3`
+
 ## 2.9.0-pre.2
 
 ### Patch Changes
diff --git a/packages/remix-architect/package.json b/packages/remix-architect/package.json
index fb1d20718e6..3f1dbd79a99 100644
--- a/packages/remix-architect/package.json
+++ b/packages/remix-architect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/architect",
-  "version": "2.9.0-pre.2",
+  "version": "2.9.0-pre.3",
   "description": "Architect server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare-pages/CHANGELOG.md b/packages/remix-cloudflare-pages/CHANGELOG.md
index daffc533f15..38aee61f87d 100644
--- a/packages/remix-cloudflare-pages/CHANGELOG.md
+++ b/packages/remix-cloudflare-pages/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-pages`
 
+## 2.9.0-pre.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/cloudflare@2.9.0-pre.3`
+
 ## 2.9.0-pre.2
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare-pages/package.json b/packages/remix-cloudflare-pages/package.json
index b9a116e62b6..49b8d2c8d76 100644
--- a/packages/remix-cloudflare-pages/package.json
+++ b/packages/remix-cloudflare-pages/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-pages",
-  "version": "2.9.0-pre.2",
+  "version": "2.9.0-pre.3",
   "description": "Cloudflare Pages request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare-workers/CHANGELOG.md b/packages/remix-cloudflare-workers/CHANGELOG.md
index 59b4a411820..6a55d32e06e 100644
--- a/packages/remix-cloudflare-workers/CHANGELOG.md
+++ b/packages/remix-cloudflare-workers/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-workers`
 
+## 2.9.0-pre.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/cloudflare@2.9.0-pre.3`
+
 ## 2.9.0-pre.2
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare-workers/package.json b/packages/remix-cloudflare-workers/package.json
index d2756150745..4acd83379ff 100644
--- a/packages/remix-cloudflare-workers/package.json
+++ b/packages/remix-cloudflare-workers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-workers",
-  "version": "2.9.0-pre.2",
+  "version": "2.9.0-pre.3",
   "description": "Cloudflare worker request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare/CHANGELOG.md b/packages/remix-cloudflare/CHANGELOG.md
index 6ee4df37075..324e050c709 100644
--- a/packages/remix-cloudflare/CHANGELOG.md
+++ b/packages/remix-cloudflare/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare`
 
+## 2.9.0-pre.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.3`
+
 ## 2.9.0-pre.2
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare/package.json b/packages/remix-cloudflare/package.json
index 9075e35859d..aad75ba519c 100644
--- a/packages/remix-cloudflare/package.json
+++ b/packages/remix-cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare",
-  "version": "2.9.0-pre.2",
+  "version": "2.9.0-pre.3",
   "description": "Cloudflare platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-css-bundle/CHANGELOG.md b/packages/remix-css-bundle/CHANGELOG.md
index 034ee9b965b..280cddc5c91 100644
--- a/packages/remix-css-bundle/CHANGELOG.md
+++ b/packages/remix-css-bundle/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @remix-run/css-bundle
 
+## 2.9.0-pre.3
+
 ## 2.9.0-pre.2
 
 ## 2.9.0-pre.1
diff --git a/packages/remix-css-bundle/package.json b/packages/remix-css-bundle/package.json
index 5974d24a495..6c282dcc9bf 100644
--- a/packages/remix-css-bundle/package.json
+++ b/packages/remix-css-bundle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/css-bundle",
-  "version": "2.9.0-pre.2",
+  "version": "2.9.0-pre.3",
   "description": "CSS bundle href when using CSS bundling features in Remix",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix-deno/CHANGELOG.md b/packages/remix-deno/CHANGELOG.md
index 96d35ccda8d..fdd4efe1790 100644
--- a/packages/remix-deno/CHANGELOG.md
+++ b/packages/remix-deno/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/deno`
 
+## 2.9.0-pre.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.3`
+
 ## 2.9.0-pre.2
 
 ### Patch Changes
diff --git a/packages/remix-deno/package.json b/packages/remix-deno/package.json
index b75abf50996..4f9ac021adb 100644
--- a/packages/remix-deno/package.json
+++ b/packages/remix-deno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/deno",
-  "version": "2.9.0-pre.2",
+  "version": "2.9.0-pre.3",
   "description": "Deno platform abstractions for Remix",
   "homepage": "https://remix.run",
   "main": "./index.ts",
diff --git a/packages/remix-dev/CHANGELOG.md b/packages/remix-dev/CHANGELOG.md
index 1cac39088c5..233a20ce194 100644
--- a/packages/remix-dev/CHANGELOG.md
+++ b/packages/remix-dev/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/dev`
 
+## 2.9.0-pre.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.3`
+  - `@remix-run/server-runtime@2.9.0-pre.3`
+
 ## 2.9.0-pre.2
 
 ### Patch Changes
diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json
index 5a5a876fa92..4a405c06b13 100644
--- a/packages/remix-dev/package.json
+++ b/packages/remix-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/dev",
-  "version": "2.9.0-pre.2",
+  "version": "2.9.0-pre.3",
   "description": "Dev tools and CLI for Remix",
   "homepage": "https://remix.run",
   "bugs": {
@@ -106,8 +106,8 @@
     "wrangler": "^3.28.2"
   },
   "peerDependencies": {
-    "@remix-run/react": "^2.9.0-pre.2",
-    "@remix-run/serve": "^2.9.0-pre.2",
+    "@remix-run/react": "^2.9.0-pre.3",
+    "@remix-run/serve": "^2.9.0-pre.3",
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2"
diff --git a/packages/remix-eslint-config/CHANGELOG.md b/packages/remix-eslint-config/CHANGELOG.md
index 4e20210c408..79cc312a8df 100644
--- a/packages/remix-eslint-config/CHANGELOG.md
+++ b/packages/remix-eslint-config/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `@remix-run/eslint-config`
 
+## 2.9.0-pre.3
+
 ## 2.9.0-pre.2
 
 ## 2.9.0-pre.1
diff --git a/packages/remix-eslint-config/package.json b/packages/remix-eslint-config/package.json
index 66c324cfda7..9768895dd46 100644
--- a/packages/remix-eslint-config/package.json
+++ b/packages/remix-eslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/eslint-config",
-  "version": "2.9.0-pre.2",
+  "version": "2.9.0-pre.3",
   "description": "ESLint configuration for Remix projects",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-express/CHANGELOG.md b/packages/remix-express/CHANGELOG.md
index 4364a335e6f..c3b642be296 100644
--- a/packages/remix-express/CHANGELOG.md
+++ b/packages/remix-express/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/express`
 
+## 2.9.0-pre.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.3`
+
 ## 2.9.0-pre.2
 
 ### Patch Changes
diff --git a/packages/remix-express/package.json b/packages/remix-express/package.json
index d1dd74be65e..69c3ee287bf 100644
--- a/packages/remix-express/package.json
+++ b/packages/remix-express/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/express",
-  "version": "2.9.0-pre.2",
+  "version": "2.9.0-pre.3",
   "description": "Express server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-node/CHANGELOG.md b/packages/remix-node/CHANGELOG.md
index d81ba2719cf..e4e9af3e2c8 100644
--- a/packages/remix-node/CHANGELOG.md
+++ b/packages/remix-node/CHANGELOG.md
@@ -1,5 +1,15 @@
 # `@remix-run/node`
 
+## 2.9.0-pre.3
+
+### Patch Changes
+
+- - Put `undici` fetch polyfill behind a new `installGlobals({ nativeFetch: true })` parameter ([#9198](https://github.com/remix-run/remix/pull/9198))
+  - `remix-serve` will default to using `undici` for the fetch polyfill if `future._unstable_singleFetch` is enabled because the single fetch implementation relies on the `undici` polyfill
+    - Any users opting into Single Fetch and managing their own polfill will need to pass the flag to `installGlobals` on their own to avoid runtime errors with Single Fetch
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.3`
+
 ## 2.9.0-pre.2
 
 ### Patch Changes
diff --git a/packages/remix-node/package.json b/packages/remix-node/package.json
index a46308f4b72..4e167765bd1 100644
--- a/packages/remix-node/package.json
+++ b/packages/remix-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/node",
-  "version": "2.9.0-pre.2",
+  "version": "2.9.0-pre.3",
   "description": "Node.js platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-react/CHANGELOG.md b/packages/remix-react/CHANGELOG.md
index 5364d66c93a..33ff0f52e04 100644
--- a/packages/remix-react/CHANGELOG.md
+++ b/packages/remix-react/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/react`
 
+## 2.9.0-pre.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.3`
+
 ## 2.9.0-pre.2
 
 ### Patch Changes
diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json
index 8412e1c6d51..240bd3ff30d 100644
--- a/packages/remix-react/package.json
+++ b/packages/remix-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/react",
-  "version": "2.9.0-pre.2",
+  "version": "2.9.0-pre.3",
   "description": "React DOM bindings for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-serve/CHANGELOG.md b/packages/remix-serve/CHANGELOG.md
index 57d5d1b9dfd..7d97e8fb1fc 100644
--- a/packages/remix-serve/CHANGELOG.md
+++ b/packages/remix-serve/CHANGELOG.md
@@ -1,5 +1,16 @@
 # `@remix-run/serve`
 
+## 2.9.0-pre.3
+
+### Patch Changes
+
+- - Put `undici` fetch polyfill behind a new `installGlobals({ nativeFetch: true })` parameter ([#9198](https://github.com/remix-run/remix/pull/9198))
+  - `remix-serve` will default to using `undici` for the fetch polyfill if `future._unstable_singleFetch` is enabled because the single fetch implementation relies on the `undici` polyfill
+    - Any users opting into Single Fetch and managing their own polfill will need to pass the flag to `installGlobals` on their own to avoid runtime errors with Single Fetch
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.3`
+  - `@remix-run/express@2.9.0-pre.3`
+
 ## 2.9.0-pre.2
 
 ### Patch Changes
diff --git a/packages/remix-serve/package.json b/packages/remix-serve/package.json
index 130bac2bad3..8c205d24de8 100644
--- a/packages/remix-serve/package.json
+++ b/packages/remix-serve/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/serve",
-  "version": "2.9.0-pre.2",
+  "version": "2.9.0-pre.3",
   "description": "Production application server for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-server-runtime/CHANGELOG.md b/packages/remix-server-runtime/CHANGELOG.md
index cca98ebc9bb..586592101d1 100644
--- a/packages/remix-server-runtime/CHANGELOG.md
+++ b/packages/remix-server-runtime/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `@remix-run/server-runtime`
 
+## 2.9.0-pre.3
+
 ## 2.9.0-pre.2
 
 ## 2.9.0-pre.1
diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json
index 4c22b9ee198..7c9314383d4 100644
--- a/packages/remix-server-runtime/package.json
+++ b/packages/remix-server-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/server-runtime",
-  "version": "2.9.0-pre.2",
+  "version": "2.9.0-pre.3",
   "description": "Server runtime for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-testing/CHANGELOG.md b/packages/remix-testing/CHANGELOG.md
index 2cc50090dbc..c3f06a112e5 100644
--- a/packages/remix-testing/CHANGELOG.md
+++ b/packages/remix-testing/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/testing`
 
+## 2.9.0-pre.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.3`
+  - `@remix-run/react@2.9.0-pre.3`
+
 ## 2.9.0-pre.2
 
 ### Patch Changes
diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
index c6e96fab0c5..60f1ebb69f2 100644
--- a/packages/remix-testing/package.json
+++ b/packages/remix-testing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/testing",
-  "version": "2.9.0-pre.2",
+  "version": "2.9.0-pre.3",
   "description": "Testing utilities for Remix apps",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix/package.json b/packages/remix/package.json
index a6f5b846328..6a6d95392bd 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "remix",
-  "version": "2.9.0-pre.2",
+  "version": "2.9.0-pre.3",
   "description": "A framework for building better websites",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e1ba8025df1..71a0026b13d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -548,13 +548,13 @@ importers:
   integration/helpers/vite-cloudflare-template:
     dependencies:
       '@remix-run/cloudflare':
-        specifier: 2.9.0-pre.2
+        specifier: 2.9.0-pre.3
         version: link:../../../packages/remix-cloudflare
       '@remix-run/cloudflare-pages':
-        specifier: 2.9.0-pre.2
+        specifier: 2.9.0-pre.3
         version: link:../../../packages/remix-cloudflare-pages
       '@remix-run/react':
-        specifier: 2.9.0-pre.2
+        specifier: 2.9.0-pre.3
         version: link:../../../packages/remix-react
       isbot:
         specifier: ^4.1.0
@@ -868,7 +868,7 @@ importers:
         specifier: workspace:*
         version: link:../remix-node
       '@remix-run/react':
-        specifier: ^2.9.0-pre.2
+        specifier: ^2.9.0-pre.3
         version: link:../remix-react
       '@remix-run/router':
         specifier: 1.16.0-pre.1

From 6edd56211c5b256e2e78f781695fdb39a037463e Mon Sep 17 00:00:00 2001
From: Muhammad Jalabi <54796248+muhammadjalabi@users.noreply.github.com>
Date: Fri, 5 Apr 2024 17:57:10 +0200
Subject: [PATCH 058/108] Update vite-configuration link to vite-config where
 linked to in docs (#9205)

---
 contributors.yml                      | 1 +
 docs/discussion/server-vs-client.md   | 2 +-
 docs/file-conventions/remix-config.md | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/contributors.yml b/contributors.yml
index 23a5a9c13c9..4f3955d0f8b 100644
--- a/contributors.yml
+++ b/contributors.yml
@@ -455,6 +455,7 @@
 - msutkowski
 - mthenw
 - mtt87
+- muhammadjalabi
 - mush159
 - n8agrin
 - na2hiro
diff --git a/docs/discussion/server-vs-client.md b/docs/discussion/server-vs-client.md
index 6f30d56a027..984db3109e4 100644
--- a/docs/discussion/server-vs-client.md
+++ b/docs/discussion/server-vs-client.md
@@ -183,7 +183,7 @@ export const PostPreview = ({ title, description }) => {
 [file_convention_server]: ../file-conventions/-server
 [window_global]: https://developer.mozilla.org/en-US/docs/Web/API/Window/window
 [server-bundles]: ../future/server-bundles
-[vite-config]: ../file-conventions/vite-configuration
+[vite-config]: ../file-conventions/vite-config
 [vite-env-only]: https://github.com/pcattori/vite-env-only
 [classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
 [remix-vite]: ../future/vite
diff --git a/docs/file-conventions/remix-config.md b/docs/file-conventions/remix-config.md
index bd5c4638fae..96a7eced14e 100644
--- a/docs/file-conventions/remix-config.md
+++ b/docs/file-conventions/remix-config.md
@@ -287,4 +287,4 @@ There are a few conventions that Remix uses you should be aware of.
 [relativesplatpath]: https://reactrouter.com/en/main/hooks/use-resolved-path#splat-paths
 [classic-remix-compiler]: ../future/vite#classic-remix-compiler-vs-remix-vite
 [remix-vite]: ../future/vite
-[vite-config]: ./vite-configuration
+[vite-config]: ./vite-config

From 427b0736ee56e03eb0a3bc742b95429463ccf0f0 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Fri, 5 Apr 2024 17:02:26 -0400
Subject: [PATCH 059/108] Update draft release notes

---
 CHANGELOG.md | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc1399c1645..b260f7137e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -183,13 +183,20 @@ Date: 2024-04-03
 - The `json`/`defer`/`redirect` utilities are deprecated when using Single Fetch (but still work _mostly_ the same)
 - Actions no longer automatically revalidate on `4xx`/`5xx` responses - you can return a `2xx` to opt-into revalidation or use `shouldRevalidate`
 
+> [!IMPORTANT]
+> Single Fetch requires using `undici` as your fetch polyfill, or using the built-in fetch on Node 20+, because it relies on APIs available there but not in the `@remix-run/web-fetch` polyfill. Please refer to the [Undici](#undici) section below for more details.
+>
+> - If you are managing your own server and calling `installGlobals`, you will need to call `installGlobals({ nativeFetch: true })` to avoid runtime errors when using Dingle Fetch
+> - If you are using `remix-serve`, you'll be switched to use `undici` automatically when you enable Single Fetch
+
 #### Undici
 
-With Remix `2.9.0`, we have switched the underlying [Web Fetch](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API) polyfills to use the [`undici`](https://github.com/nodejs/undici) package. This change has a few primary benefits:
+Remix `2.9.0` adds a new `installGlobals({ nativeFetch: true })` flag to opt into using [`undici`](https://github.com/nodejs/undici) for the [Web Fetch](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API) polyfills instead of the [`@remix-run/web-*` packages](https://github.com/remix-run/web-std-io). This change has a few primary benefits:
 
-- It allows us to stop maintaining our own [web-std-io fork](https://github.com/remix-run/web-std-io)
+- It will allow us to stop maintaining our own [web-std-io fork](https://github.com/remix-run/web-std-io) in future versions of Remix
 - It should bring us more in-line with spec compliance
-  - ⚠️ It is possible that some non-spec-compliant bugs in our fork will be fixed" with this move, so beware of "breaking bug fixes" and keep an eye on any advanced fetch API interactions you're performing in your app
+  - ⚠️ It is possible that some non-spec-compliant bugs in our fork will be "fixed" by moving to `undici`, so beware of "breaking bug fixes" and keep an eye on any advanced `fetch` API interactions you're performing in your app
+  - ⚠️ In some cases, `undici` may have different behavior by design -- Most notably, `undici`'s garbage collection behavior differs and you are [required to consume all fetch response bodies](https://github.com/nodejs/undici?tab=readme-ov-file#garbage-collection) to avoid a memory leak in your app
 - Because `undici` is the fetch implementation used by `node` internally, it should better prepare Remix apps to more smoothly drop the polyfill to use the built-in Node.js APIs on `node` 20+
 
 ### Minor Changes
@@ -198,13 +205,16 @@ With Remix `2.9.0`, we have switched the underlying [Web Fetch](https://develope
 - `@remix-run/dev` - Improve `getDependenciesToBundle` resolution in monorepos ([#8848](https://github.com/remix-run/remix/pull/8848))
 - `@remix-run/dev` - Fix SPA mode when Single Fetch is enabled by using streaming `entry.server` ([#9063](https://github.com/remix-run/remix/pull/9063))
 - `@remix-run/dev` - Vite: added sourcemap support for transformed routes ([#8970](https://github.com/remix-run/remix/pull/8970))
-- `@remix-run/node` - Use [`undici`](https://github.com/nodejs/undici) as the fetch polyfill going forward instead of `@remix-run/web-*` ([#9106](https://github.com/remix-run/remix/pull/9106), [#9111](https://github.com/remix-run/remix/pull/9111))
+- `@remix-run/node` - Add a new `installGlobals({ nativeFetch: true })` flag to opt-into using [`undici`](https://github.com/nodejs/undici) as the fetch polyfill instead of `@remix-run/web-*` ([#9106](https://github.com/remix-run/remix/pull/9106), [#9111](https://github.com/remix-run/remix/pull/9111), [#9198](https://github.com/remix-run/remix/pull/9198))
+  - ⚠️ When enabling `future._unstable_singleFetch`, `remix-serve` will default to using `undici` as the polyfill because the single fetch implementation relies on the `undici` polyfill
+  - ⚠️ Any users opting into Single Fetch and managing their own polyfill (i.e., not using `remix-serve`) will need to pass the flag to `installGlobals` on their own to avoid runtime errors with Single Fetch
 - `@remix-run/server-runtime` - Add `ResponseStub` header interface for Single Fetch and deprecate the `headers` export ([#9142](https://github.com/remix-run/remix/pull/9142))
 - `@remix-run/server-runtime` - Handle redirects created by `handleDataRequest` ([#9104](https://github.com/remix-run/remix/pull/9104))
 
 ### Patch Changes
 
 - `create-remix` - Allow `.` in repo name when using `--template` flag ([#9026](https://github.com/remix-run/remix/pull/9026))
+- `@remix-run/dev` - Update links printed to the console by the Remix CLI/Dev Server to point to updated docs locations ([#9176](https://github.com/remix-run/remix/pull/9176))
 
 ### Updated Dependencies
 

From 3357c5d4d7598b7bfe3080d23cea3b870f772b3c Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Fri, 5 Apr 2024 17:05:36 -0400
Subject: [PATCH 060/108] Update draft release notes

---
 CHANGELOG.md | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b260f7137e1..a19d06cb3fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -186,8 +186,8 @@ Date: 2024-04-03
 > [!IMPORTANT]
 > Single Fetch requires using `undici` as your fetch polyfill, or using the built-in fetch on Node 20+, because it relies on APIs available there but not in the `@remix-run/web-fetch` polyfill. Please refer to the [Undici](#undici) section below for more details.
 >
-> - If you are managing your own server and calling `installGlobals`, you will need to call `installGlobals({ nativeFetch: true })` to avoid runtime errors when using Dingle Fetch
-> - If you are using `remix-serve`, you'll be switched to use `undici` automatically when you enable Single Fetch
+> - If you are managing your own server and calling `installGlobals()`, you will need to call `installGlobals({ nativeFetch: true })` to avoid runtime errors when using Single Fetch
+> - If you are using `remix-serve`, it will use `undici` automatically if Single Fetch is enabled
 
 #### Undici
 
@@ -196,7 +196,7 @@ Remix `2.9.0` adds a new `installGlobals({ nativeFetch: true })` flag to opt int
 - It will allow us to stop maintaining our own [web-std-io fork](https://github.com/remix-run/web-std-io) in future versions of Remix
 - It should bring us more in-line with spec compliance
   - ⚠️ It is possible that some non-spec-compliant bugs in our fork will be "fixed" by moving to `undici`, so beware of "breaking bug fixes" and keep an eye on any advanced `fetch` API interactions you're performing in your app
-  - ⚠️ In some cases, `undici` may have different behavior by design -- Most notably, `undici`'s garbage collection behavior differs and you are [required to consume all fetch response bodies](https://github.com/nodejs/undici?tab=readme-ov-file#garbage-collection) to avoid a memory leak in your app
+  - ⚠️ In some cases, `undici` may have different behavior by design -- most notably, `undici`'s garbage collection behavior differs and you are [required to consume all fetch response bodies](https://github.com/nodejs/undici?tab=readme-ov-file#garbage-collection) to avoid a memory leak in your app
 - Because `undici` is the fetch implementation used by `node` internally, it should better prepare Remix apps to more smoothly drop the polyfill to use the built-in Node.js APIs on `node` 20+
 
 ### Minor Changes
@@ -206,8 +206,6 @@ Remix `2.9.0` adds a new `installGlobals({ nativeFetch: true })` flag to opt int
 - `@remix-run/dev` - Fix SPA mode when Single Fetch is enabled by using streaming `entry.server` ([#9063](https://github.com/remix-run/remix/pull/9063))
 - `@remix-run/dev` - Vite: added sourcemap support for transformed routes ([#8970](https://github.com/remix-run/remix/pull/8970))
 - `@remix-run/node` - Add a new `installGlobals({ nativeFetch: true })` flag to opt-into using [`undici`](https://github.com/nodejs/undici) as the fetch polyfill instead of `@remix-run/web-*` ([#9106](https://github.com/remix-run/remix/pull/9106), [#9111](https://github.com/remix-run/remix/pull/9111), [#9198](https://github.com/remix-run/remix/pull/9198))
-  - ⚠️ When enabling `future._unstable_singleFetch`, `remix-serve` will default to using `undici` as the polyfill because the single fetch implementation relies on the `undici` polyfill
-  - ⚠️ Any users opting into Single Fetch and managing their own polyfill (i.e., not using `remix-serve`) will need to pass the flag to `installGlobals` on their own to avoid runtime errors with Single Fetch
 - `@remix-run/server-runtime` - Add `ResponseStub` header interface for Single Fetch and deprecate the `headers` export ([#9142](https://github.com/remix-run/remix/pull/9142))
 - `@remix-run/server-runtime` - Handle redirects created by `handleDataRequest` ([#9104](https://github.com/remix-run/remix/pull/9104))
 

From be68f5290d6dd4ae3a8aa1dd620aa5ff2fd60950 Mon Sep 17 00:00:00 2001
From: Mark Dalgleish <mark.john.dalgleish@gmail.com>
Date: Mon, 15 Apr 2024 15:29:34 +1000
Subject: [PATCH 061/108] Fix Playwright hanging in Node 20.5.2+ (#9232)

---
 .github/workflows/test-full.yml             | 6 +++---
 .github/workflows/test-pr-ubuntu.yml        | 4 ++--
 .github/workflows/test-pr-windows-macos.yml | 8 ++++----
 integration/playwright.config.ts            | 5 +++++
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test-full.yml b/.github/workflows/test-full.yml
index a719583adf5..9eb2c9f9bad 100644
--- a/.github/workflows/test-full.yml
+++ b/.github/workflows/test-full.yml
@@ -45,7 +45,7 @@ jobs:
     uses: ./.github/workflows/shared-test-integration.yml
     with:
       os: "ubuntu-latest"
-      node_version: '[18, "20.5.1"]'
+      node_version: "[18, 20]"
       browser: '["chromium", "firefox"]'
 
   integration-windows:
@@ -54,7 +54,7 @@ jobs:
     uses: ./.github/workflows/shared-test-integration.yml
     with:
       os: "windows-latest"
-      node_version: '[18, "20.5.1"]'
+      node_version: "[18, 20]"
       browser: '["msedge"]'
 
   integration-macos:
@@ -63,5 +63,5 @@ jobs:
     uses: ./.github/workflows/shared-test-integration.yml
     with:
       os: "macos-latest"
-      node_version: '[18, "20.5.1"]'
+      node_version: "[18, 20]"
       browser: '["webkit"]'
diff --git a/.github/workflows/test-pr-ubuntu.yml b/.github/workflows/test-pr-ubuntu.yml
index dd9e83a3534..709a238e2c5 100644
--- a/.github/workflows/test-pr-ubuntu.yml
+++ b/.github/workflows/test-pr-ubuntu.yml
@@ -27,7 +27,7 @@ jobs:
     uses: ./.github/workflows/shared-test-unit.yml
     with:
       os: "ubuntu-latest"
-      node_version: '["20.5.1"]'
+      node_version: "[20]"
 
   integration-chromium:
     name: "👀 Integration Test"
@@ -35,5 +35,5 @@ jobs:
     uses: ./.github/workflows/shared-test-integration.yml
     with:
       os: "ubuntu-latest"
-      node_version: '["20.5.1"]'
+      node_version: "[20]"
       browser: '["chromium"]'
diff --git a/.github/workflows/test-pr-windows-macos.yml b/.github/workflows/test-pr-windows-macos.yml
index 6115528bf98..c3f42de20f6 100644
--- a/.github/workflows/test-pr-windows-macos.yml
+++ b/.github/workflows/test-pr-windows-macos.yml
@@ -20,7 +20,7 @@ jobs:
     uses: ./.github/workflows/shared-test-unit.yml
     with:
       os: "windows-latest"
-      node_version: '["20.5.1"]'
+      node_version: "[20]"
 
   integration-firefox:
     name: "👀 Integration Test"
@@ -28,7 +28,7 @@ jobs:
     uses: ./.github/workflows/shared-test-integration.yml
     with:
       os: "ubuntu-latest"
-      node_version: '["20.5.1"]'
+      node_version: "[20]"
       browser: '["firefox"]'
 
   integration-msedge:
@@ -37,7 +37,7 @@ jobs:
     uses: ./.github/workflows/shared-test-integration.yml
     with:
       os: "windows-latest"
-      node_version: '["20.5.1"]'
+      node_version: "[20]"
       browser: '["msedge"]'
 
   integration-webkit:
@@ -46,5 +46,5 @@ jobs:
     uses: ./.github/workflows/shared-test-integration.yml
     with:
       os: "macos-latest"
-      node_version: '["20.5.1"]'
+      node_version: "[20]"
       browser: '["webkit"]'
diff --git a/integration/playwright.config.ts b/integration/playwright.config.ts
index 62c3e39cfd3..6f2113059a6 100644
--- a/integration/playwright.config.ts
+++ b/integration/playwright.config.ts
@@ -4,6 +4,11 @@ import { devices } from "@playwright/test";
 const config: PlaywrightTestConfig = {
   testDir: ".",
   testMatch: ["**/*-test.ts"],
+  // Playwright treats our workspace packages as internal by default. If we
+  // don't mark them as external, tests hang in Node 20.5.2+
+  build: {
+    external: ["**/packages/**/*"],
+  },
   /* Maximum time one test can run for. */
   timeout: process.platform === "win32" ? 60_000 : 30_000,
   fullyParallel: true,

From 3e947ece9d88326d94340d758cf21052e2ea36b2 Mon Sep 17 00:00:00 2001
From: Kyle Uerkwitz <38047633+uerkw@users.noreply.github.com>
Date: Mon, 15 Apr 2024 10:52:17 -0400
Subject: [PATCH 062/108] Fix wrong file path in headers.md (#9228)

---
 contributors.yml      | 1 +
 docs/route/headers.md | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/contributors.yml b/contributors.yml
index 4f3955d0f8b..04512169aff 100644
--- a/contributors.yml
+++ b/contributors.yml
@@ -621,6 +621,7 @@
 - twhitbeck
 - tylerbrostrom
 - udasitharani
+- uerkw
 - uhoh-itsmaciek
 - unhackit
 - UsamaHameed
diff --git a/docs/route/headers.md b/docs/route/headers.md
index b01706baa74..30384fb238e 100644
--- a/docs/route/headers.md
+++ b/docs/route/headers.md
@@ -60,7 +60,7 @@ If a user is looking at `/users/123/profile` and `users.$userId.profile.tsx` doe
 
 If all three define `headers`, the deepest module wins, in this case `users.$userId.profile.tsx`. However, if your `users.$userId.profile.tsx`'s `loader` threw and bubbled to a boundary in `users.userId.tsx` - then `users.userId.tsx`'s `headers` function would be used as it is the leaf rendered route.
 
-We don't want surprise headers in your responses, so it's your job to merge them if you'd like. Remix passes in the `parentHeaders` to your `headers` function. So `users.$userId.users.tsx` headers get passed to `users.$userId.tsx`, and then `users.$userId.tsx`'s `headers` are passed to `users.$userId.profile.tsx`'s `headers`.
+We don't want surprise headers in your responses, so it's your job to merge them if you'd like. Remix passes in the `parentHeaders` to your `headers` function. So `users.tsx` headers get passed to `users.$userId.tsx`, and then `users.$userId.tsx`'s `headers` are passed to `users.$userId.profile.tsx`'s `headers`.
 
 That is all to say that Remix has given you a very large gun with which to shoot your foot. You need to be careful not to send a `Cache-Control` from a child route module that is more aggressive than a parent route. Here's some code that picks the least aggressive caching in these cases:
 

From 8ec1e0cbf79ad0754fa71433451e7fc1e66ebfeb Mon Sep 17 00:00:00 2001
From: Adishwar Rishi <adiswa123@gmail.com>
Date: Tue, 16 Apr 2024 04:11:02 +1000
Subject: [PATCH 063/108] template(cloudflare): Update remix cloudflare
 template to latest package versions (#9197)

---
 contributors.yml                  | 1 +
 templates/cloudflare/package.json | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/contributors.yml b/contributors.yml
index 04512169aff..ccf91fdc40a 100644
--- a/contributors.yml
+++ b/contributors.yml
@@ -7,6 +7,7 @@
 - achinchen
 - adamwathan
 - adicuco
+- AdiRishi
 - ahabhgk
 - ahbruns
 - ahmedeldessouki
diff --git a/templates/cloudflare/package.json b/templates/cloudflare/package.json
index 6e3f91793a3..87d0c9f2c22 100644
--- a/templates/cloudflare/package.json
+++ b/templates/cloudflare/package.json
@@ -16,12 +16,12 @@
     "@remix-run/cloudflare-pages": "*",
     "@remix-run/react": "*",
     "isbot": "^4.1.0",
-    "miniflare": "^3.20231030.4",
+    "miniflare": "^3.20240404.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20230518.0",
+    "@cloudflare/workers-types": "^4.20240405.0",
     "@remix-run/dev": "*",
     "@types/react": "^18.2.20",
     "@types/react-dom": "^18.2.7",
@@ -37,7 +37,7 @@
     "typescript": "^5.1.6",
     "vite": "^5.1.0",
     "vite-tsconfig-paths": "^4.2.1",
-    "wrangler": "^3.24.0"
+    "wrangler": "^3.48.0"
   },
   "engines": {
     "node": ">=18.0.0"

From 7aecb307cc2d555bff320c54150296257a05f1d3 Mon Sep 17 00:00:00 2001
From: Mark Dalgleish <mark.john.dalgleish@gmail.com>
Date: Tue, 16 Apr 2024 18:08:04 +1000
Subject: [PATCH 064/108] Ignore Babel config for `react-refresh` transform
 (#9241)

---
 .changeset/tame-otters-clap.md    | 5 +++++
 packages/remix-dev/vite/plugin.ts | 2 ++
 2 files changed, 7 insertions(+)
 create mode 100644 .changeset/tame-otters-clap.md

diff --git a/.changeset/tame-otters-clap.md b/.changeset/tame-otters-clap.md
new file mode 100644
index 00000000000..10d678ead9e
--- /dev/null
+++ b/.changeset/tame-otters-clap.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/dev": patch
+---
+
+Ensure Babel config files are not referenced when applying the `react-refresh` Babel transform within the Remix Vite plugin
diff --git a/packages/remix-dev/vite/plugin.ts b/packages/remix-dev/vite/plugin.ts
index 2160bcf7edf..0319e374593 100644
--- a/packages/remix-dev/vite/plugin.ts
+++ b/packages/remix-dev/vite/plugin.ts
@@ -1700,6 +1700,8 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
         }
 
         let result = await babel.transformAsync(code, {
+          configFile: false,
+          babelrc: false,
           filename: id,
           sourceFileName: filepath,
           parserOpts: {

From 87b59c19c8160936427b30d4ece4938cd1ba976a Mon Sep 17 00:00:00 2001
From: Willow Cheng <e.wingus@gmail.com>
Date: Tue, 16 Apr 2024 10:04:51 -0400
Subject: [PATCH 065/108] Update errors.md for typo of "then" (#9235)

---
 contributors.yml      | 1 +
 docs/guides/errors.md | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/contributors.yml b/contributors.yml
index ccf91fdc40a..e874e2784e6 100644
--- a/contributors.yml
+++ b/contributors.yml
@@ -670,3 +670,4 @@
 - zainfathoni
 - zayenz
 - zhe
+- willowcheng
diff --git a/docs/guides/errors.md b/docs/guides/errors.md
index 6804318ea21..8e8f89c8972 100644
--- a/docs/guides/errors.md
+++ b/docs/guides/errors.md
@@ -81,7 +81,7 @@ export function ErrorBoundary() {
 }
 ```
 
-If you need to log these errors or report then to a third-party service such as [BugSnag][bugsnag] or [Sentry][sentry], then you can do this through a [`handleError`][handle-error] export in your [`app/entry.server.js`][entry-server]. This method receives the un-sanitized versions of the error since it is also running on the server.
+If you need to log these errors or report them to a third-party service such as [BugSnag][bugsnag] or [Sentry][sentry], then you can do this through a [`handleError`][handle-error] export in your [`app/entry.server.js`][entry-server]. This method receives the un-sanitized versions of the error since it is also running on the server.
 
 If you want to trigger an error boundary and display a specific message or data in the browser, then you can throw a `Response` from a `action`/`loader` with that data instead:
 

From 98a012dee1a77c248d38d99b9768ee406751ec1b Mon Sep 17 00:00:00 2001
From: Remix Run Bot <hello@remix.run>
Date: Tue, 16 Apr 2024 14:06:38 +0000
Subject: [PATCH 066/108] chore: format

---
 contributors.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributors.yml b/contributors.yml
index e874e2784e6..042ecc33f3d 100644
--- a/contributors.yml
+++ b/contributors.yml
@@ -647,6 +647,7 @@
 - wilcoschoneveld
 - willhack
 - willin
+- willowcheng
 - wizardlyhel
 - wKovacs64
 - wladiston
@@ -670,4 +671,3 @@
 - zainfathoni
 - zayenz
 - zhe
-- willowcheng

From 2d7e7044aa59138a09c6f144d93b8b45e5b42ea9 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Wed, 17 Apr 2024 16:37:13 -0400
Subject: [PATCH 067/108] Single fetch docs updates

---
 docs/guides/single-fetch.md | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/docs/guides/single-fetch.md b/docs/guides/single-fetch.md
index fd982274473..f63d928b744 100644
--- a/docs/guides/single-fetch.md
+++ b/docs/guides/single-fetch.md
@@ -96,14 +96,7 @@ Revalidation is handled via a `?_routes` query string parameter on the single fe
 ### Headers
 
 The [`headers`][headers] function is no longer used when Single Fetch is enabled.
-Instead, your `loader`/`action` functions now receive a mutable `response` parameter unique to that execution:
-
-```ts
-type ResponseStub = {
-  status: number | undefined;
-  headers: Headers;
-};
-```
+Instead, your `loader`/`action` functions now receive a mutable `ResponseStub` unique to that execution:
 
 - To alter the status of your HTTP Response, set the `status` field directly:
   - `response.status = 201`
@@ -113,7 +106,18 @@ type ResponseStub = {
   - `response.headers.delete(name)`
 
 ```ts
-export async function action({ request, response }) {
+type ResponseStub = {
+  status: number | undefined;
+  headers: Headers;
+};
+
+export async function action({
+  request,
+  response,
+}: {
+  request: Request;
+  response?: ResponseStub;
+}) {
   if (!loggedIn(request)) {
     response.status = 401;
     response.headers.append("Set-Cookie", "foo=bar");
@@ -127,8 +131,8 @@ export async function action({ request, response }) {
 Each `loader`/`action` receives it's own unique `response` instance so you cannot see what other `loader`/`action` functions have set (which would be subject to race conditions). The resulting HTTP Response status and headers are determined as follows:
 
 - Status Code
-  - If all status codes are unset or have values <200, the deepest status code will be used for the HTTP response
-  - If any status codes are set to a value >=300, the highest >=300 value will be used for the HTTP Response
+  - If all status codes are unset or have values <300, the deepest status code will be used for the HTTP response
+  - If any status codes are set to a value >=300, the shallowest >=300 value will be used for the HTTP Response
 - Headers
   - Remix tracks header operations and will replay them on a fresh `Headers` instance after all handlers have completed
   - These are replayed in order - action first (if present) followed by loaders in top-down order
@@ -167,7 +171,7 @@ export function clientLoader({ serverLoader }) {
 }
 ```
 
-If a user navigates from `/ -> /a/b/c`, then we need to run the server loaders for `a` and `b`, and the `clientLoader` for `c` - which may eventually (or may not) call it's own server `loader`. We can't decide to include the `c` server `loader` in a single fetch call when we want to fetch the `a`/`b` `loader`'s', nor can we delay until `c` actually makes the `serverLoader` call (or returns) without introducing a waterfall.
+If a user navigates from `/ -> /a/b/c`, then we need to run the server loaders for `a` and `b`, and the `clientLoader` for `c` - which may eventually (or may not) call it's own server `loader`. We can't decide to include the `c` server `loader` in a single fetch call when we want to fetch the `a`/`b` `loader`'s, nor can we delay until `c` actually makes the `serverLoader` call (or returns) without introducing a waterfall.
 
 Therefore, when you export a `clientLoader` that route opts-out of Single Fetch and when you call `serverLoader` it will make a single fetch to get only it's route server `loader`. All routes that do not export a `clientLoader` will be fetched in a singular HTTP request.
 

From b75afdfc656b4b775b8ba55a1a0fc405c85f1150 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Thu, 18 Apr 2024 15:38:24 -0400
Subject: [PATCH 068/108] Fix typings for response in
 LoaderFunctonArgs/ActionFunctionArgs (#9254)

---
 .changeset/nice-beds-sneeze.md                |  5 +++++
 packages/remix-server-runtime/routeModules.ts |  3 +++
 packages/remix-server-runtime/routes.ts       | 13 +++++------
 packages/remix-server-runtime/single-fetch.ts | 22 ++++++++++++++-----
 4 files changed, 30 insertions(+), 13 deletions(-)
 create mode 100644 .changeset/nice-beds-sneeze.md

diff --git a/.changeset/nice-beds-sneeze.md b/.changeset/nice-beds-sneeze.md
new file mode 100644
index 00000000000..f7970bae072
--- /dev/null
+++ b/.changeset/nice-beds-sneeze.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/server-runtime": patch
+---
+
+[REMOVE] Fix typings for response in LoaderFunctonArgs/ActionFunctionArgs
diff --git a/packages/remix-server-runtime/routeModules.ts b/packages/remix-server-runtime/routeModules.ts
index 74832b6b384..0f68e0f9b21 100644
--- a/packages/remix-server-runtime/routeModules.ts
+++ b/packages/remix-server-runtime/routeModules.ts
@@ -40,6 +40,9 @@ export type ResponseStubOperation = [
 export type ResponseStub = {
   status: number | undefined;
   headers: Headers;
+};
+
+export type ResponseStubImpl = ResponseStub & {
   [ResponseStubOperationsSymbol]: ResponseStubOperation[];
 };
 
diff --git a/packages/remix-server-runtime/routes.ts b/packages/remix-server-runtime/routes.ts
index 5aade6661d5..89736b4533a 100644
--- a/packages/remix-server-runtime/routes.ts
+++ b/packages/remix-server-runtime/routes.ts
@@ -6,7 +6,8 @@ import type {
 
 import { callRouteAction, callRouteLoader } from "./data";
 import type { FutureConfig } from "./entry";
-import type { ResponseStub, ServerRouteModule } from "./routeModules";
+import type { ServerRouteModule } from "./routeModules";
+import type { DataStrategyCtx } from "./single-fetch";
 
 export interface RouteManifest<Route> {
   [routeId: string]: Route;
@@ -100,9 +101,8 @@ export function createStaticHandlerDataRoutes(
               loader: route.module.loader!,
               routeId: route.id,
               singleFetch: future.unstable_singleFetch === true,
-              response: (
-                dataStrategyCtx as unknown as { response: ResponseStub }
-              )?.response,
+              response: (dataStrategyCtx as DataStrategyCtx | undefined)
+                ?.response,
             })
         : undefined,
       action: route.module.action
@@ -114,9 +114,8 @@ export function createStaticHandlerDataRoutes(
               action: route.module.action!,
               routeId: route.id,
               singleFetch: future.unstable_singleFetch === true,
-              response: (
-                dataStrategyCtx as unknown as { response: ResponseStub }
-              )?.response,
+              response: (dataStrategyCtx as DataStrategyCtx | undefined)
+                ?.response,
             })
         : undefined,
       handle: route.module.handle,
diff --git a/packages/remix-server-runtime/single-fetch.ts b/packages/remix-server-runtime/single-fetch.ts
index c8e05e5a811..8d9d358241a 100644
--- a/packages/remix-server-runtime/single-fetch.ts
+++ b/packages/remix-server-runtime/single-fetch.ts
@@ -12,7 +12,11 @@ import { encode } from "turbo-stream";
 import type { AppLoadContext } from "./data";
 import { sanitizeError, sanitizeErrors } from "./errors";
 import { ServerMode } from "./mode";
-import type { ResponseStub, ResponseStubOperation } from "./routeModules";
+import type {
+  ResponseStub,
+  ResponseStubImpl,
+  ResponseStubOperation,
+} from "./routeModules";
 import { ResponseStubOperationsSymbol } from "./routeModules";
 import { isDeferredData, isRedirectStatusCode, isResponse } from "./responses";
 
@@ -35,6 +39,10 @@ export type SingleFetchResults = {
   [SingleFetchRedirectSymbol]?: SingleFetchRedirectResult;
 };
 
+export type DataStrategyCtx = {
+  response: ResponseStub;
+};
+
 export function getSingleFetchDataStrategy(
   responseStubs: ReturnType<typeof getResponseStubs>,
   {
@@ -54,7 +62,7 @@ export function getSingleFetchDataStrategy(
 
     let results = await Promise.all(
       matches.map(async (match) => {
-        let responseStub: ResponseStub | undefined;
+        let responseStub: ResponseStubImpl | undefined;
         if (request.method !== "GET") {
           responseStub = responseStubs[ResponseStubActionSymbol];
         } else {
@@ -62,11 +70,13 @@ export function getSingleFetchDataStrategy(
         }
 
         let result = await match.resolve(async (handler) => {
+          // Cast `ResponseStubImpl -> ResponseStub` to hide the symbol in userland
+          let ctx: DataStrategyCtx = { response: responseStub as ResponseStub };
           // Only run opt-in loaders when fine-grained revalidation is enabled
           let data =
             loadRouteIds && !loadRouteIds.includes(match.route.id)
               ? null
-              : await handler({ response: responseStub });
+              : await handler(ctx);
           return { type: "data", result: data };
         });
 
@@ -282,7 +292,7 @@ export async function singleFetchLoaders(
   }
 }
 
-export function isResponseStub(value: any): value is ResponseStub {
+export function isResponseStub(value: any): value is ResponseStubImpl {
   return (
     value && typeof value === "object" && ResponseStubOperationsSymbol in value
   );
@@ -310,7 +320,7 @@ function getResponseStub(status?: number) {
 }
 
 export function getResponseStubs() {
-  return new Proxy({} as Record<string | symbol, ResponseStub>, {
+  return new Proxy({} as Record<string | symbol, ResponseStubImpl>, {
     get(responseStubCache, prop) {
       let cached = responseStubCache[prop];
       if (!cached) {
@@ -324,7 +334,7 @@ export function getResponseStubs() {
 function proxyResponseToResponseStub(
   status: number | undefined,
   headers: Headers,
-  responseStub: ResponseStub
+  responseStub: ResponseStubImpl
 ) {
   if (status != null && responseStub.status == null) {
     responseStub.status = status;

From 9fc3d727f0d2684b06d842410d3e0edad2df4357 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 19 Apr 2024 09:33:15 -0400
Subject: [PATCH 069/108] chore: Update version for release (pre) (#9255)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json                                       | 1 +
 integration/helpers/vite-cloudflare-template/package.json | 6 +++---
 packages/create-remix/CHANGELOG.md                        | 2 ++
 packages/create-remix/package.json                        | 2 +-
 packages/remix-architect/CHANGELOG.md                     | 7 +++++++
 packages/remix-architect/package.json                     | 2 +-
 packages/remix-cloudflare-pages/CHANGELOG.md              | 7 +++++++
 packages/remix-cloudflare-pages/package.json              | 2 +-
 packages/remix-cloudflare-workers/CHANGELOG.md            | 7 +++++++
 packages/remix-cloudflare-workers/package.json            | 2 +-
 packages/remix-cloudflare/CHANGELOG.md                    | 7 +++++++
 packages/remix-cloudflare/package.json                    | 2 +-
 packages/remix-css-bundle/CHANGELOG.md                    | 2 ++
 packages/remix-css-bundle/package.json                    | 2 +-
 packages/remix-deno/CHANGELOG.md                          | 7 +++++++
 packages/remix-deno/package.json                          | 2 +-
 packages/remix-dev/CHANGELOG.md                           | 8 ++++++++
 packages/remix-dev/package.json                           | 6 +++---
 packages/remix-eslint-config/CHANGELOG.md                 | 2 ++
 packages/remix-eslint-config/package.json                 | 2 +-
 packages/remix-express/CHANGELOG.md                       | 7 +++++++
 packages/remix-express/package.json                       | 2 +-
 packages/remix-node/CHANGELOG.md                          | 7 +++++++
 packages/remix-node/package.json                          | 2 +-
 packages/remix-react/CHANGELOG.md                         | 7 +++++++
 packages/remix-react/package.json                         | 2 +-
 packages/remix-serve/CHANGELOG.md                         | 8 ++++++++
 packages/remix-serve/package.json                         | 2 +-
 packages/remix-server-runtime/CHANGELOG.md                | 6 ++++++
 packages/remix-server-runtime/package.json                | 2 +-
 packages/remix-testing/CHANGELOG.md                       | 8 ++++++++
 packages/remix-testing/package.json                       | 2 +-
 packages/remix/package.json                               | 2 +-
 pnpm-lock.yaml                                            | 8 ++++----
 34 files changed, 118 insertions(+), 25 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index bdcac8f7960..8748d657d60 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -31,6 +31,7 @@
     "good-buses-divide",
     "heavy-steaks-remember",
     "honest-geese-chew",
+    "nice-beds-sneeze",
     "odd-frogs-attend",
     "popular-adults-remain",
     "response-stub",
diff --git a/integration/helpers/vite-cloudflare-template/package.json b/integration/helpers/vite-cloudflare-template/package.json
index e00f05d3bae..2e84cac7e88 100644
--- a/integration/helpers/vite-cloudflare-template/package.json
+++ b/integration/helpers/vite-cloudflare-template/package.json
@@ -11,9 +11,9 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/cloudflare": "2.9.0-pre.3",
-    "@remix-run/cloudflare-pages": "2.9.0-pre.3",
-    "@remix-run/react": "2.9.0-pre.3",
+    "@remix-run/cloudflare": "2.9.0-pre.4",
+    "@remix-run/cloudflare-pages": "2.9.0-pre.4",
+    "@remix-run/react": "2.9.0-pre.4",
     "isbot": "^4.1.0",
     "miniflare": "^3.20231030.4",
     "react": "^18.2.0",
diff --git a/packages/create-remix/CHANGELOG.md b/packages/create-remix/CHANGELOG.md
index 24ad6c6187d..b4a81e1ad8e 100644
--- a/packages/create-remix/CHANGELOG.md
+++ b/packages/create-remix/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `create-remix`
 
+## 2.9.0-pre.4
+
 ## 2.9.0-pre.3
 
 ## 2.9.0-pre.2
diff --git a/packages/create-remix/package.json b/packages/create-remix/package.json
index 36974ce5839..66e488a3a7b 100644
--- a/packages/create-remix/package.json
+++ b/packages/create-remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-remix",
-  "version": "2.9.0-pre.3",
+  "version": "2.9.0-pre.4",
   "description": "Create a new Remix app",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix-architect/CHANGELOG.md b/packages/remix-architect/CHANGELOG.md
index 7f293884b34..fb370429497 100644
--- a/packages/remix-architect/CHANGELOG.md
+++ b/packages/remix-architect/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/architect`
 
+## 2.9.0-pre.4
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.4`
+
 ## 2.9.0-pre.3
 
 ### Patch Changes
diff --git a/packages/remix-architect/package.json b/packages/remix-architect/package.json
index 3f1dbd79a99..45a9c3c5903 100644
--- a/packages/remix-architect/package.json
+++ b/packages/remix-architect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/architect",
-  "version": "2.9.0-pre.3",
+  "version": "2.9.0-pre.4",
   "description": "Architect server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare-pages/CHANGELOG.md b/packages/remix-cloudflare-pages/CHANGELOG.md
index 38aee61f87d..c332799cea3 100644
--- a/packages/remix-cloudflare-pages/CHANGELOG.md
+++ b/packages/remix-cloudflare-pages/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-pages`
 
+## 2.9.0-pre.4
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/cloudflare@2.9.0-pre.4`
+
 ## 2.9.0-pre.3
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare-pages/package.json b/packages/remix-cloudflare-pages/package.json
index 49b8d2c8d76..f8ac9a11d4e 100644
--- a/packages/remix-cloudflare-pages/package.json
+++ b/packages/remix-cloudflare-pages/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-pages",
-  "version": "2.9.0-pre.3",
+  "version": "2.9.0-pre.4",
   "description": "Cloudflare Pages request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare-workers/CHANGELOG.md b/packages/remix-cloudflare-workers/CHANGELOG.md
index 6a55d32e06e..f7bf7f7d3a4 100644
--- a/packages/remix-cloudflare-workers/CHANGELOG.md
+++ b/packages/remix-cloudflare-workers/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-workers`
 
+## 2.9.0-pre.4
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/cloudflare@2.9.0-pre.4`
+
 ## 2.9.0-pre.3
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare-workers/package.json b/packages/remix-cloudflare-workers/package.json
index 4acd83379ff..0f227ca9f44 100644
--- a/packages/remix-cloudflare-workers/package.json
+++ b/packages/remix-cloudflare-workers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-workers",
-  "version": "2.9.0-pre.3",
+  "version": "2.9.0-pre.4",
   "description": "Cloudflare worker request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare/CHANGELOG.md b/packages/remix-cloudflare/CHANGELOG.md
index 324e050c709..28de023fab8 100644
--- a/packages/remix-cloudflare/CHANGELOG.md
+++ b/packages/remix-cloudflare/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare`
 
+## 2.9.0-pre.4
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.4`
+
 ## 2.9.0-pre.3
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare/package.json b/packages/remix-cloudflare/package.json
index aad75ba519c..0850e98748f 100644
--- a/packages/remix-cloudflare/package.json
+++ b/packages/remix-cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare",
-  "version": "2.9.0-pre.3",
+  "version": "2.9.0-pre.4",
   "description": "Cloudflare platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-css-bundle/CHANGELOG.md b/packages/remix-css-bundle/CHANGELOG.md
index 280cddc5c91..ef59d12190c 100644
--- a/packages/remix-css-bundle/CHANGELOG.md
+++ b/packages/remix-css-bundle/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @remix-run/css-bundle
 
+## 2.9.0-pre.4
+
 ## 2.9.0-pre.3
 
 ## 2.9.0-pre.2
diff --git a/packages/remix-css-bundle/package.json b/packages/remix-css-bundle/package.json
index 6c282dcc9bf..209ab496740 100644
--- a/packages/remix-css-bundle/package.json
+++ b/packages/remix-css-bundle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/css-bundle",
-  "version": "2.9.0-pre.3",
+  "version": "2.9.0-pre.4",
   "description": "CSS bundle href when using CSS bundling features in Remix",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix-deno/CHANGELOG.md b/packages/remix-deno/CHANGELOG.md
index fdd4efe1790..0188b9ea09f 100644
--- a/packages/remix-deno/CHANGELOG.md
+++ b/packages/remix-deno/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/deno`
 
+## 2.9.0-pre.4
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.4`
+
 ## 2.9.0-pre.3
 
 ### Patch Changes
diff --git a/packages/remix-deno/package.json b/packages/remix-deno/package.json
index 4f9ac021adb..268690a1caf 100644
--- a/packages/remix-deno/package.json
+++ b/packages/remix-deno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/deno",
-  "version": "2.9.0-pre.3",
+  "version": "2.9.0-pre.4",
   "description": "Deno platform abstractions for Remix",
   "homepage": "https://remix.run",
   "main": "./index.ts",
diff --git a/packages/remix-dev/CHANGELOG.md b/packages/remix-dev/CHANGELOG.md
index 233a20ce194..261a41d53b8 100644
--- a/packages/remix-dev/CHANGELOG.md
+++ b/packages/remix-dev/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/dev`
 
+## 2.9.0-pre.4
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.4`
+  - `@remix-run/node@2.9.0-pre.4`
+
 ## 2.9.0-pre.3
 
 ### Patch Changes
diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json
index 4a405c06b13..fe96980eeca 100644
--- a/packages/remix-dev/package.json
+++ b/packages/remix-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/dev",
-  "version": "2.9.0-pre.3",
+  "version": "2.9.0-pre.4",
   "description": "Dev tools and CLI for Remix",
   "homepage": "https://remix.run",
   "bugs": {
@@ -106,8 +106,8 @@
     "wrangler": "^3.28.2"
   },
   "peerDependencies": {
-    "@remix-run/react": "^2.9.0-pre.3",
-    "@remix-run/serve": "^2.9.0-pre.3",
+    "@remix-run/react": "^2.9.0-pre.4",
+    "@remix-run/serve": "^2.9.0-pre.4",
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2"
diff --git a/packages/remix-eslint-config/CHANGELOG.md b/packages/remix-eslint-config/CHANGELOG.md
index 79cc312a8df..8843dc1cc33 100644
--- a/packages/remix-eslint-config/CHANGELOG.md
+++ b/packages/remix-eslint-config/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `@remix-run/eslint-config`
 
+## 2.9.0-pre.4
+
 ## 2.9.0-pre.3
 
 ## 2.9.0-pre.2
diff --git a/packages/remix-eslint-config/package.json b/packages/remix-eslint-config/package.json
index 9768895dd46..9ce9d42d8b4 100644
--- a/packages/remix-eslint-config/package.json
+++ b/packages/remix-eslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/eslint-config",
-  "version": "2.9.0-pre.3",
+  "version": "2.9.0-pre.4",
   "description": "ESLint configuration for Remix projects",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-express/CHANGELOG.md b/packages/remix-express/CHANGELOG.md
index c3b642be296..9a3447858e5 100644
--- a/packages/remix-express/CHANGELOG.md
+++ b/packages/remix-express/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/express`
 
+## 2.9.0-pre.4
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.4`
+
 ## 2.9.0-pre.3
 
 ### Patch Changes
diff --git a/packages/remix-express/package.json b/packages/remix-express/package.json
index 69c3ee287bf..ca7d8b4779f 100644
--- a/packages/remix-express/package.json
+++ b/packages/remix-express/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/express",
-  "version": "2.9.0-pre.3",
+  "version": "2.9.0-pre.4",
   "description": "Express server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-node/CHANGELOG.md b/packages/remix-node/CHANGELOG.md
index e4e9af3e2c8..7e209bff41c 100644
--- a/packages/remix-node/CHANGELOG.md
+++ b/packages/remix-node/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/node`
 
+## 2.9.0-pre.4
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.4`
+
 ## 2.9.0-pre.3
 
 ### Patch Changes
diff --git a/packages/remix-node/package.json b/packages/remix-node/package.json
index 4e167765bd1..3fdd5e8d1e0 100644
--- a/packages/remix-node/package.json
+++ b/packages/remix-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/node",
-  "version": "2.9.0-pre.3",
+  "version": "2.9.0-pre.4",
   "description": "Node.js platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-react/CHANGELOG.md b/packages/remix-react/CHANGELOG.md
index 33ff0f52e04..731e2bcbe2e 100644
--- a/packages/remix-react/CHANGELOG.md
+++ b/packages/remix-react/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/react`
 
+## 2.9.0-pre.4
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.4`
+
 ## 2.9.0-pre.3
 
 ### Patch Changes
diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json
index 240bd3ff30d..0cd60ef7f61 100644
--- a/packages/remix-react/package.json
+++ b/packages/remix-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/react",
-  "version": "2.9.0-pre.3",
+  "version": "2.9.0-pre.4",
   "description": "React DOM bindings for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-serve/CHANGELOG.md b/packages/remix-serve/CHANGELOG.md
index 7d97e8fb1fc..3027782eed9 100644
--- a/packages/remix-serve/CHANGELOG.md
+++ b/packages/remix-serve/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/serve`
 
+## 2.9.0-pre.4
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.4`
+  - `@remix-run/express@2.9.0-pre.4`
+
 ## 2.9.0-pre.3
 
 ### Patch Changes
diff --git a/packages/remix-serve/package.json b/packages/remix-serve/package.json
index 8c205d24de8..42546de112c 100644
--- a/packages/remix-serve/package.json
+++ b/packages/remix-serve/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/serve",
-  "version": "2.9.0-pre.3",
+  "version": "2.9.0-pre.4",
   "description": "Production application server for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-server-runtime/CHANGELOG.md b/packages/remix-server-runtime/CHANGELOG.md
index 586592101d1..0ce730c4ebe 100644
--- a/packages/remix-server-runtime/CHANGELOG.md
+++ b/packages/remix-server-runtime/CHANGELOG.md
@@ -1,5 +1,11 @@
 # `@remix-run/server-runtime`
 
+## 2.9.0-pre.4
+
+### Patch Changes
+
+- [REMOVE] Fix typings for response in LoaderFunctonArgs/ActionFunctionArgs ([#9254](https://github.com/remix-run/remix/pull/9254))
+
 ## 2.9.0-pre.3
 
 ## 2.9.0-pre.2
diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json
index 7c9314383d4..d8078db104d 100644
--- a/packages/remix-server-runtime/package.json
+++ b/packages/remix-server-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/server-runtime",
-  "version": "2.9.0-pre.3",
+  "version": "2.9.0-pre.4",
   "description": "Server runtime for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-testing/CHANGELOG.md b/packages/remix-testing/CHANGELOG.md
index c3f06a112e5..4da1e10b314 100644
--- a/packages/remix-testing/CHANGELOG.md
+++ b/packages/remix-testing/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/testing`
 
+## 2.9.0-pre.4
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.4`
+  - `@remix-run/react@2.9.0-pre.4`
+
 ## 2.9.0-pre.3
 
 ### Patch Changes
diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
index 60f1ebb69f2..7fd689961e6 100644
--- a/packages/remix-testing/package.json
+++ b/packages/remix-testing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/testing",
-  "version": "2.9.0-pre.3",
+  "version": "2.9.0-pre.4",
   "description": "Testing utilities for Remix apps",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix/package.json b/packages/remix/package.json
index 6a6d95392bd..43f1ce3656a 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "remix",
-  "version": "2.9.0-pre.3",
+  "version": "2.9.0-pre.4",
   "description": "A framework for building better websites",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 71a0026b13d..f4a925dcbe9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -548,13 +548,13 @@ importers:
   integration/helpers/vite-cloudflare-template:
     dependencies:
       '@remix-run/cloudflare':
-        specifier: 2.9.0-pre.3
+        specifier: 2.9.0-pre.4
         version: link:../../../packages/remix-cloudflare
       '@remix-run/cloudflare-pages':
-        specifier: 2.9.0-pre.3
+        specifier: 2.9.0-pre.4
         version: link:../../../packages/remix-cloudflare-pages
       '@remix-run/react':
-        specifier: 2.9.0-pre.3
+        specifier: 2.9.0-pre.4
         version: link:../../../packages/remix-react
       isbot:
         specifier: ^4.1.0
@@ -868,7 +868,7 @@ importers:
         specifier: workspace:*
         version: link:../remix-node
       '@remix-run/react':
-        specifier: ^2.9.0-pre.3
+        specifier: ^2.9.0-pre.4
         version: link:../remix-react
       '@remix-run/router':
         specifier: 1.16.0-pre.1

From 4fa42c52956eed92d23d45c5365ab5eea0385d16 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Fri, 19 Apr 2024 09:48:53 -0400
Subject: [PATCH 070/108] Update manual routes config docs to be vite-first

---
 docs/discussion/routes.md | 53 ++++++++++++++++++++++++---------------
 1 file changed, 33 insertions(+), 20 deletions(-)

diff --git a/docs/discussion/routes.md b/docs/discussion/routes.md
index 2e4b18b4cad..47cc2417b39 100644
--- a/docs/discussion/routes.md
+++ b/docs/discussion/routes.md
@@ -85,7 +85,7 @@ app/
 └── root.tsx
 ```
 
-You can read more about the specific patterns in the file names and other features in the [Route File Conventions][route_file_conventions] reference.
+You can read more about the specific patterns in the file names and other features in the [Route File Conventions][route-file-conventions] reference.
 
 Only the folders directly beneath `app/routes` will be registered as a route. Deeply nested folders are ignored. The file at `app/routes/about/header/route.tsx` will not create a route.
 
@@ -101,7 +101,7 @@ app/
 
 ## Manual Route Configuration
 
-While the `app/routes` folder offers a convenient convention for developers, Remix appreciates that one size doesn't fit all. There are times when the provided convention might not align with specific project requirements or a developer's preferences. In such cases, Remix allows for manual route configuration via [`remix.config.js`][remix_config]. This flexibility ensures developers can structure their application in a way that makes sense for their project.
+While the `app/routes` folder offers a convenient convention for developers, Remix appreciates that one size doesn't fit all. There are times when the provided convention might not align with specific project requirements or a developer's preferences. In such cases, Remix allows for manual route configuration via [`vite.config.ts`][vite-routes]. This flexibility ensures developers can structure their application in a way that makes sense for their project.
 
 A common way to structure an app is by top-level features folders. Consider that routes related to a particular theme, like concerts, likely share several modules. Organizing them under a single folder makes sense:
 
@@ -123,26 +123,39 @@ app/
 └── root.tsx
 ```
 
-To configure this structure into the same URLs as the previous examples, you can use the `routes` function in `remix.config.js`:
-
-```js filename=remix.config.js
-/** @type {import('@remix-run/dev').AppConfig} */
-export default {
-  routes(defineRoutes) {
-    return defineRoutes((route) => {
-      route("/", "home/route.tsx", { index: true });
-      route("about", "about/route.tsx");
-      route("concerts", "concerts/layout.tsx", () => {
-        route("", "concerts/home.tsx", { index: true });
-        route("trending", "concerts/trending.tsx");
-        route(":city", "concerts/city.tsx");
-      });
-    });
+To configure this structure into the same URLs as the previous examples, you can use the `routes` function in `vite-config.ts`:
+
+```ts filename=vite.config.ts
+import { vitePlugin as remix } from "@remix-run/dev";
+import { defineConfig } from "vite";
+
+export default defineConfig({
+  plugins: [
+    remix({
+      routes(defineRoutes) {
+        return defineRoutes((route) => {
+          route("/", "home/route.tsx", { index: true });
+          route("about", "about/route.tsx");
+          route("concerts", "concerts/layout.tsx", () => {
+            route("", "concerts/home.tsx", { index: true });
+            route("trending", "concerts/trending.tsx");
+            route(":city", "concerts/city.tsx");
+          });
+        });
+      }
+    }),
   },
 };
 ```
 
-Remix's route configuration approach blends convention with flexibility. You can use the `app/routes` folder for an easy, organized way to set up your routes. If you want more control, dislike the file names, or have unique needs, there's `remix.config.js`. It is expected that many apps forgo the routes folder convention in favor of `remix.config.js`.
+Remix's route configuration approach blends convention with flexibility. You can use the `app/routes` folder for an easy, organized way to set up your routes. If you want more control, dislike the file names, or have unique needs, there's `vite.config.ts`. It is expected that many apps forgo the routes folder convention in favor of `vite.config.ts`.
 
-[route_file_conventions]: ../file-conventions/routes
-[remix_config]: ../file-conventions/remix-config
+<docs-warning>
+If you have not yet migrated to using [Vite][remix-vite] and are still using the [Classic Remix Compiler][classic-remix-compiler], you can configure routes manually in your [`remix.config.js`][remix-config] file.
+</docs-warning>
+
+[route-file-conventions]: ../file-conventions/routes
+[remix-config]: ../file-conventions/remix-config
+[classic-remix-compiler]: ../guides/vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ../guides/vite
+[vite-routes]: ../file-conventions/vite-config#routes

From f4c1dbd7226bba2262f9f9849a843b4ae2c3ad2f Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Fri, 19 Apr 2024 09:50:26 -0400
Subject: [PATCH 071/108] Revert "Update manual routes config docs to be
 vite-first"

This reverts commit 4fa42c52956eed92d23d45c5365ab5eea0385d16.
---
 docs/discussion/routes.md | 53 +++++++++++++++------------------------
 1 file changed, 20 insertions(+), 33 deletions(-)

diff --git a/docs/discussion/routes.md b/docs/discussion/routes.md
index 47cc2417b39..2e4b18b4cad 100644
--- a/docs/discussion/routes.md
+++ b/docs/discussion/routes.md
@@ -85,7 +85,7 @@ app/
 └── root.tsx
 ```
 
-You can read more about the specific patterns in the file names and other features in the [Route File Conventions][route-file-conventions] reference.
+You can read more about the specific patterns in the file names and other features in the [Route File Conventions][route_file_conventions] reference.
 
 Only the folders directly beneath `app/routes` will be registered as a route. Deeply nested folders are ignored. The file at `app/routes/about/header/route.tsx` will not create a route.
 
@@ -101,7 +101,7 @@ app/
 
 ## Manual Route Configuration
 
-While the `app/routes` folder offers a convenient convention for developers, Remix appreciates that one size doesn't fit all. There are times when the provided convention might not align with specific project requirements or a developer's preferences. In such cases, Remix allows for manual route configuration via [`vite.config.ts`][vite-routes]. This flexibility ensures developers can structure their application in a way that makes sense for their project.
+While the `app/routes` folder offers a convenient convention for developers, Remix appreciates that one size doesn't fit all. There are times when the provided convention might not align with specific project requirements or a developer's preferences. In such cases, Remix allows for manual route configuration via [`remix.config.js`][remix_config]. This flexibility ensures developers can structure their application in a way that makes sense for their project.
 
 A common way to structure an app is by top-level features folders. Consider that routes related to a particular theme, like concerts, likely share several modules. Organizing them under a single folder makes sense:
 
@@ -123,39 +123,26 @@ app/
 └── root.tsx
 ```
 
-To configure this structure into the same URLs as the previous examples, you can use the `routes` function in `vite-config.ts`:
-
-```ts filename=vite.config.ts
-import { vitePlugin as remix } from "@remix-run/dev";
-import { defineConfig } from "vite";
-
-export default defineConfig({
-  plugins: [
-    remix({
-      routes(defineRoutes) {
-        return defineRoutes((route) => {
-          route("/", "home/route.tsx", { index: true });
-          route("about", "about/route.tsx");
-          route("concerts", "concerts/layout.tsx", () => {
-            route("", "concerts/home.tsx", { index: true });
-            route("trending", "concerts/trending.tsx");
-            route(":city", "concerts/city.tsx");
-          });
-        });
-      }
-    }),
+To configure this structure into the same URLs as the previous examples, you can use the `routes` function in `remix.config.js`:
+
+```js filename=remix.config.js
+/** @type {import('@remix-run/dev').AppConfig} */
+export default {
+  routes(defineRoutes) {
+    return defineRoutes((route) => {
+      route("/", "home/route.tsx", { index: true });
+      route("about", "about/route.tsx");
+      route("concerts", "concerts/layout.tsx", () => {
+        route("", "concerts/home.tsx", { index: true });
+        route("trending", "concerts/trending.tsx");
+        route(":city", "concerts/city.tsx");
+      });
+    });
   },
 };
 ```
 
-Remix's route configuration approach blends convention with flexibility. You can use the `app/routes` folder for an easy, organized way to set up your routes. If you want more control, dislike the file names, or have unique needs, there's `vite.config.ts`. It is expected that many apps forgo the routes folder convention in favor of `vite.config.ts`.
+Remix's route configuration approach blends convention with flexibility. You can use the `app/routes` folder for an easy, organized way to set up your routes. If you want more control, dislike the file names, or have unique needs, there's `remix.config.js`. It is expected that many apps forgo the routes folder convention in favor of `remix.config.js`.
 
-<docs-warning>
-If you have not yet migrated to using [Vite][remix-vite] and are still using the [Classic Remix Compiler][classic-remix-compiler], you can configure routes manually in your [`remix.config.js`][remix-config] file.
-</docs-warning>
-
-[route-file-conventions]: ../file-conventions/routes
-[remix-config]: ../file-conventions/remix-config
-[classic-remix-compiler]: ../guides/vite#classic-remix-compiler-vs-remix-vite
-[remix-vite]: ../guides/vite
-[vite-routes]: ../file-conventions/vite-config#routes
+[route_file_conventions]: ../file-conventions/routes
+[remix_config]: ../file-conventions/remix-config

From 525c00889a614ffaf34a7af6e357a39bca89d36e Mon Sep 17 00:00:00 2001
From: alongdate <167442392+alongdate@users.noreply.github.com>
Date: Fri, 19 Apr 2024 21:52:49 +0800
Subject: [PATCH 072/108] chore: remove repetitive words (#9260)

Signed-off-by: alongdate <alongyear@outlook.com>
---
 DEVELOPMENT.md                                |  2 +-
 contributors.yml                              |  1 +
 decisions/0007-remix-on-react-router-6-4-0.md |  2 +-
 integration/error-sanitization-test.ts        | 10 +++++-----
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 3db2cd30156..6f81c06e48d 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -69,7 +69,7 @@ You may need to make changes to a pre-release prior to publishing a final stable
 - Create a new changeset: `yarn changeset`
   - **IMPORTANT:** This is required even if you ultimately don't want to include these changes in the logs
   - Remember, changelogs can be edited prior to publishing, but the Changeset version script needs to see new changesets in order to create a new version
-- Commit the changesets and push the the `release-*` branch to GitHub
+- Commit the changesets and push the `release-*` branch to GitHub
 - Wait for the release workflow to finish and the Changesets action to open its PR that will increment all versions
 - Review the PR, make any adjustments necessary, and merge it into the `release-*` branch
 - Once the PR is merged, the release workflow will publish the updated packages to npm
diff --git a/contributors.yml b/contributors.yml
index 042ecc33f3d..e8a0d2986f2 100644
--- a/contributors.yml
+++ b/contributors.yml
@@ -31,6 +31,7 @@
 - alireza-bonab
 - alisd23
 - ally1002
+- alongdate
 - AltanS
 - alvinthen
 - amir-ziaei
diff --git a/decisions/0007-remix-on-react-router-6-4-0.md b/decisions/0007-remix-on-react-router-6-4-0.md
index 4eb50a8b919..7d925c4299d 100644
--- a/decisions/0007-remix-on-react-router-6-4-0.md
+++ b/decisions/0007-remix-on-react-router-6-4-0.md
@@ -129,7 +129,7 @@ We can also split this into iterative approaches on the server too, and do `hand
 5. `handleDocumentRequest`
    1. This is the big one. It simplifies down pretty far, but has the biggest surface area where some things don't quite match up
    2. We need to map query "errors" to Remix's definition of error/catch and bubble them upwards accordingly.
-      1. For example, in a URL like `/a/b/c`, if C exports a a `CatchBoundary` but not an `ErrorBoundary`, then it'll be represented in the `DataRouteObject` with `hasErrorBoundary=true` since the `@remix-run/router` doesn't distinguish
+      1. For example, in a URL like `/a/b/c`, if C exports a `CatchBoundary` but not an `ErrorBoundary`, then it'll be represented in the `DataRouteObject` with `hasErrorBoundary=true` since the `@remix-run/router` doesn't distinguish
       2. If C's loader throws an error, the router will "catch" that at C's `errorElement`, but we then need to re-bubble that upwards to the nearest `ErrorBoundary`
       3. See `differentiateCatchVersusErrorBoundaries` in the `brophdawg11/rrr` branch
    3. New `RemixContext`
diff --git a/integration/error-sanitization-test.ts b/integration/error-sanitization-test.ts
index 63f57fc3a18..c8fcf1d5bdc 100644
--- a/integration/error-sanitization-test.ts
+++ b/integration/error-sanitization-test.ts
@@ -206,7 +206,7 @@ test.describe("Error Sanitization", () => {
       expect(html).toMatch("Defer Route");
       expect(html).toMatch("RESOLVED");
       expect(html).not.toMatch("MESSAGE:");
-      // Defer errors are not not part of the JSON blob but rather rejected
+      // Defer errors are not part of the JSON blob but rather rejected
       // against a pending promise and therefore are inlined JS.
       expect(html).not.toMatch("x.stack=e.stack;");
     });
@@ -217,7 +217,7 @@ test.describe("Error Sanitization", () => {
       expect(html).toMatch("Defer Error");
       expect(html).not.toMatch("RESOLVED");
       expect(html).toMatch('{"message":"Unexpected Server Error"}');
-      // Defer errors are not not part of the JSON blob but rather rejected
+      // Defer errors are not part of the JSON blob but rather rejected
       // against a pending promise and therefore are inlined JS.
       expect(html).toMatch("x.stack=undefined;");
       // defer errors are not logged to the server console since the request
@@ -371,7 +371,7 @@ test.describe("Error Sanitization", () => {
       let html = await response.text();
       expect(html).toMatch("Defer Error");
       expect(html).not.toMatch("RESOLVED");
-      // Defer errors are not not part of the JSON blob but rather rejected
+      // Defer errors are not part of the JSON blob but rather rejected
       // against a pending promise and therefore are inlined JS.
       expect(html).toMatch("x.stack=e.stack;");
       // defer errors are not logged to the server console since the request
@@ -567,7 +567,7 @@ test.describe("Error Sanitization", () => {
       expect(html).toMatch("Defer Route");
       expect(html).toMatch("RESOLVED");
       expect(html).not.toMatch("MESSAGE:");
-      // Defer errors are not not part of the JSON blob but rather rejected
+      // Defer errors are not part of the JSON blob but rather rejected
       // against a pending promise and therefore are inlined JS.
       expect(html).not.toMatch("x.stack=e.stack;");
     });
@@ -578,7 +578,7 @@ test.describe("Error Sanitization", () => {
       expect(html).toMatch("Defer Error");
       expect(html).not.toMatch("RESOLVED");
       expect(html).toMatch('{"message":"Unexpected Server Error"}');
-      // Defer errors are not not part of the JSON blob but rather rejected
+      // Defer errors are not part of the JSON blob but rather rejected
       // against a pending promise and therefore are inlined JS.
       expect(html).toMatch("x.stack=undefined;");
       // defer errors are not logged to the server console since the request

From 88508f7b675ff359b49d7b6ff6e2fbcdbbbbede3 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Fri, 19 Apr 2024 10:04:46 -0400
Subject: [PATCH 073/108] Update route docs (#9263)

Co-authored-by: Pavindu Lakshan <pavindulakshan@gmail.com>
---
 docs/discussion/routes.md | 57 ++++++++++++++++++++++++---------------
 1 file changed, 35 insertions(+), 22 deletions(-)

diff --git a/docs/discussion/routes.md b/docs/discussion/routes.md
index 2e4b18b4cad..59692ea19e4 100644
--- a/docs/discussion/routes.md
+++ b/docs/discussion/routes.md
@@ -85,7 +85,7 @@ app/
 └── root.tsx
 ```
 
-You can read more about the specific patterns in the file names and other features in the [Route File Conventions][route_file_conventions] reference.
+You can read more about the specific patterns in the file names and other features in the [Route File Conventions][route-file-conventions] reference.
 
 Only the folders directly beneath `app/routes` will be registered as a route. Deeply nested folders are ignored. The file at `app/routes/about/header/route.tsx` will not create a route.
 
@@ -101,7 +101,11 @@ app/
 
 ## Manual Route Configuration
 
-While the `app/routes` folder offers a convenient convention for developers, Remix appreciates that one size doesn't fit all. There are times when the provided convention might not align with specific project requirements or a developer's preferences. In such cases, Remix allows for manual route configuration via [`remix.config.js`][remix_config]. This flexibility ensures developers can structure their application in a way that makes sense for their project.
+While the `app/routes` folder offers a convenient convention for developers, Remix appreciates that one size doesn't fit all. There are times when the provided convention might not align with specific project requirements or a developer's preferences. In such cases, Remix allows for manual route configuration via [`vite.config.ts`][vite-routes]. This flexibility ensures developers can structure their application in a way that makes sense for their project.
+
+<docs-warning>
+If you have not yet migrated to [Vite][remix-vite] and are still using the [Classic Remix Compiler][classic-remix-compiler], you can configure routes manually in your [`remix.config.js`][remix-config] file.
+</docs-warning>
 
 A common way to structure an app is by top-level features folders. Consider that routes related to a particular theme, like concerts, likely share several modules. Organizing them under a single folder makes sense:
 
@@ -123,26 +127,35 @@ app/
 └── root.tsx
 ```
 
-To configure this structure into the same URLs as the previous examples, you can use the `routes` function in `remix.config.js`:
-
-```js filename=remix.config.js
-/** @type {import('@remix-run/dev').AppConfig} */
-export default {
-  routes(defineRoutes) {
-    return defineRoutes((route) => {
-      route("/", "home/route.tsx", { index: true });
-      route("about", "about/route.tsx");
-      route("concerts", "concerts/layout.tsx", () => {
-        route("", "concerts/home.tsx", { index: true });
-        route("trending", "concerts/trending.tsx");
-        route(":city", "concerts/city.tsx");
-      });
-    });
-  },
-};
+To configure this structure into the same URLs as the previous examples, you can use the `routes` function in `vite.config.ts`:
+
+```ts filename=vite.config.ts
+import { vitePlugin as remix } from "@remix-run/dev";
+import { defineConfig } from "vite";
+
+export default defineConfig({
+  plugins: [
+    remix({
+      routes(defineRoutes) {
+        return defineRoutes((route) => {
+          route("/", "home/route.tsx", { index: true });
+          route("about", "about/route.tsx");
+          route("concerts", "concerts/layout.tsx", () => {
+            route("", "concerts/home.tsx", { index: true });
+            route("trending", "concerts/trending.tsx");
+            route(":city", "concerts/city.tsx");
+          });
+        });
+      },
+    }),
+  ],
+});
 ```
 
-Remix's route configuration approach blends convention with flexibility. You can use the `app/routes` folder for an easy, organized way to set up your routes. If you want more control, dislike the file names, or have unique needs, there's `remix.config.js`. It is expected that many apps forgo the routes folder convention in favor of `remix.config.js`.
+Remix's route configuration approach blends convention with flexibility. You can use the `app/routes` folder for an easy, organized way to set up your routes. If you want more control, dislike the file names, or have unique needs, there's `vite.config.ts`. It is expected that many apps forgo the routes folder convention in favor of `vite.config.ts`.
 
-[route_file_conventions]: ../file-conventions/routes
-[remix_config]: ../file-conventions/remix-config
+[route-file-conventions]: ../file-conventions/routes
+[remix-config]: ../file-conventions/remix-config
+[classic-remix-compiler]: ../guides/vite#classic-remix-compiler-vs-remix-vite
+[remix-vite]: ../guides/vite
+[vite-routes]: ../file-conventions/vite-config#routes

From 2c207b61c3a239fbcc6ec9bbe1a5c42d60aeccf8 Mon Sep 17 00:00:00 2001
From: Pedro Cattori <pcattori@gmail.com>
Date: Mon, 22 Apr 2024 15:57:23 -0400
Subject: [PATCH 074/108] opt-in type inference for single-fetch (#9272)

Co-authored-by: Matt Brophy <matt@brophy.org>
---
 .changeset/young-eagles-grab.md               |   6 +
 docs/guides/single-fetch.md                   |  57 +++++++--
 packages/remix-react/future/single-fetch.d.ts | 121 ++++++++++++++++++
 packages/remix-react/index.tsx                |   1 +
 packages/remix-react/rollup.config.js         |   1 +
 5 files changed, 172 insertions(+), 14 deletions(-)
 create mode 100644 .changeset/young-eagles-grab.md
 create mode 100644 packages/remix-react/future/single-fetch.d.ts

diff --git a/.changeset/young-eagles-grab.md b/.changeset/young-eagles-grab.md
new file mode 100644
index 00000000000..784b5b7c859
--- /dev/null
+++ b/.changeset/young-eagles-grab.md
@@ -0,0 +1,6 @@
+---
+"@remix-run/react": patch
+---
+
+Opt-in types for single-fetch
+- To opt-in to type inference for single-fetch, add `./node_modules/@remix-run/react/future/single-fetch.d.ts` to `include` in your `tsconfig.json`
diff --git a/docs/guides/single-fetch.md b/docs/guides/single-fetch.md
index f63d928b744..8f66f81e651 100644
--- a/docs/guides/single-fetch.md
+++ b/docs/guides/single-fetch.md
@@ -51,11 +51,28 @@ You can control this by exporting a `streamTimeout` numeric value from your `ent
 
 ### Type Inference
 
-The current generics support type inference but have a built-in assumption of a JSON-serialized response. With the new streaming format, this assumption no longer holds so `useLoaderData<typeof loader>()` will _not_ return the proper types because it would assume that a `Date` would be a string on the client 😕. Unfortunately, we can't make these types aware of a runtime future flag and we do not want to introduce another hook just for this. Thankfully, the manual typing is much simpler without needing to think about JSON serialization, so the current recommendation is to skip the generics when opting into single fetch and manually cast the type yourself:
+Without Single Fetch, any plain Javascript object returned from a `loader` or `action` is automatically serialized into a JSON response (as if you returned it via `json`). The type inference assumes this is the case and infer naked object returns as if they were JSON serialized.
+
+With Single Fetch, naked objects will be streamed directly, so the built-in type inference is no longer accurate once you have opted-into Single Fetch. For example, they would assume that a `Date` would be serialized to a string on the client 😕.
+
+In order to ensure you get the proper types when using Single Fetch, we've included a set of type overrides that you can include in your `tsconfig.json` which aligns the types with the Single Fetch behavior:
+
+```json
+{
+  "include": [
+    // ...
+    "./node_modules/@remix-run/react/future/single-fetch.d.ts"
+  ]
+}
+```
+
+**`useLoaderData`, `useActionData`, `useRouteLoaderData`, and `useFetcher`**
+
+These methods do not require any code changes on your part - adding the single fetch types will cause their generics to deserialize correctly:
 
 ```ts
 export async function loader() {
-  const data = await fetchSomeData(); // Assume this returns
+  const data = await fetchSomeData();
   return {
     message: data.message, // <- string
     date: data.date, // <- Date
@@ -63,26 +80,38 @@ export async function loader() {
 }
 
 export default function Component() {
-  // ❌ Before
+  // ❌ Before opting into single fetch types, types are serialized via JSON.stringify
   const data = useLoaderData<typeof loader>();
   //    ^? { message: string, date: string }
 
-  // ✅ After
-  const data = useLoaderData() as unknown as Awaited<
-    ReturnType<typeof loader>
-  >;
+  // ✅ After opting into single fetch types, types are serialized via turbo-stream
+  const data = useLoaderData<typeof loader>;
   //    ^? { message: string, date: Date }
 }
 ```
 
-In the next version of Remix, we may re-introduce this generic, but in the meantime you could wrap this up into your own utility:
+**`useMatches`**
 
-```ts
-function useTypedLoaderData<T>() {
-  return useLoaderData() as unknown as Awaited<
-    ReturnType<T>
-  >;
-}
+`useMatches` requires a manual cast to specify the loader type in order to get proper type inference on a given `match.data`. When using Single Fetch, you will need to replace the `UIMatch` type with `UIMatch_SingleFetch`:
+
+```diff
+  let matches = useMatches();
+- let rootMatch = matches[0] as UIMatch<typeof loader>;
++ let rootMatch = matches[0] as UIMatch_SingleFetch<typeof loader>;
+```
+
+**`meta` Function**
+
+`meta` functions also require a generic to indicate the current and ancestor route loader types in order to properly type the `data` and `matches` parameters. When using Single Fetch, you will need to replace the `MetaArgs` type with `MetaArgs_SingleFetch`:
+
+```diff
+  export function meta({
+    data,
+    matches,
+- }: MetaArgs<typeof loader, { root: typeof rootLoader }>) {
++ }: MetaArgs_SingleFetch<typeof loader, { root: typeof rootLoader }>) {
+    // ...
+  }
 ```
 
 ### Revalidations
diff --git a/packages/remix-react/future/single-fetch.d.ts b/packages/remix-react/future/single-fetch.d.ts
new file mode 100644
index 00000000000..3ea4d76b710
--- /dev/null
+++ b/packages/remix-react/future/single-fetch.d.ts
@@ -0,0 +1,121 @@
+import type { MetaArgs, UNSAFE_MetaMatch } from "@remix-run/react";
+import type {
+  LoaderFunctionArgs,
+  ActionFunctionArgs,
+  SerializeFrom,
+  TypedDeferredData,
+  TypedResponse,
+} from "@remix-run/server-runtime";
+import type {
+  useFetcher as useFetcherRR,
+  FetcherWithComponents,
+} from "react-router-dom";
+
+type Serializable =
+  | undefined
+  | null
+  | boolean
+  | string
+  | symbol
+  | number
+  | Array<Serializable>
+  | { [key: PropertyKey]: Serializable }
+  | bigint
+  | Date
+  | URL
+  | RegExp
+  | Error
+  | Map<Serializable, Serializable>
+  | Set<Serializable>
+  | Promise<Serializable>;
+
+type DataFunctionReturnValue =
+  | Serializable
+  | TypedDeferredData<Record<string, unknown>>
+  | TypedResponse<Record<string, unknown>>;
+
+type LoaderFunction_SingleFetch = (
+  args: LoaderFunctionArgs
+) => Promise<DataFunctionReturnValue>;
+type ActionFunction_SingleFetch = (
+  args: ActionFunctionArgs
+) => Promise<DataFunctionReturnValue>;
+
+// Backwards-compatible type for Remix v2 where json/defer still use the old types,
+// and only non-json/defer returns use the new types.  This allows for incremental
+// migration of loaders to return naked objects.  In the next major version,
+// json/defer will be removed so everything will use the new simplified typings.
+// prettier-ignore
+type SingleFetchSerialize_V2<T extends LoaderFunction_SingleFetch | ActionFunction_SingleFetch> =
+  Awaited<ReturnType<T>> extends TypedDeferredData<infer D> ? D :
+  Awaited<ReturnType<T>> extends TypedResponse<Record<string, unknown>> ? SerializeFrom<T> :
+  Awaited<ReturnType<T>>;
+
+declare module "@remix-run/react" {
+  export function useLoaderData<T>(): T extends LoaderFunction_SingleFetch
+    ? SingleFetchSerialize_V2<T>
+    : never;
+
+  export function useActionData<T>(): T extends ActionFunction_SingleFetch
+    ? SingleFetchSerialize_V2<T>
+    : never;
+
+  export function useRouteLoaderData<T>(
+    routeId: string
+  ): T extends LoaderFunction_SingleFetch ? SingleFetchSerialize_V2<T> : never;
+
+  export function useFetcher<TData = unknown>(
+    opts?: Parameters<typeof useFetcherRR>[0]
+  ): FetcherWithComponents<
+    TData extends LoaderFunction_SingleFetch | ActionFunction_SingleFetch
+      ? SingleFetchSerialize_V2<TData>
+      : never
+  >;
+
+  export type UIMatch_SingleFetch<D = unknown, H = unknown> = Omit<
+    UIMatch<D, H>,
+    "data"
+  > & {
+    data: D extends LoaderFunction_SingleFetch
+      ? SingleFetchSerialize_V2<D>
+      : never;
+  };
+
+  interface MetaMatch_SingleFetch<
+    RouteId extends string = string,
+    Loader extends LoaderFunction_SingleFetch | unknown = unknown
+  > extends Omit<UNSAFE_MetaMatch<RouteId, Loader>, "data"> {
+    data: Loader extends LoaderFunction_SingleFetch
+      ? SingleFetchSerialize_V2<Loader>
+      : unknown;
+  }
+
+  type MetaMatches_SingleFetch<
+    MatchLoaders extends Record<
+      string,
+      LoaderFunction_SingleFetch | unknown
+    > = Record<string, unknown>
+  > = Array<
+    {
+      [K in keyof MatchLoaders]: MetaMatch_SingleFetch<
+        Exclude<K, number | symbol>,
+        MatchLoaders[K]
+      >;
+    }[keyof MatchLoaders]
+  >;
+
+  export interface MetaArgs_SingleFetch<
+    Loader extends LoaderFunction_SingleFetch | unknown = unknown,
+    MatchLoaders extends Record<
+      string,
+      LoaderFunction_SingleFetch | unknown
+    > = Record<string, unknown>
+  > extends Omit<MetaArgs<Loader, MatchLoaders>, "data" | "matches"> {
+    data:
+      | (Loader extends LoaderFunction_SingleFetch
+          ? SingleFetchSerialize_V2<Loader>
+          : unknown)
+      | undefined;
+    matches: MetaMatches_SingleFetch<MatchLoaders>;
+  }
+}
diff --git a/packages/remix-react/index.tsx b/packages/remix-react/index.tsx
index b4336440722..ecb54165e15 100644
--- a/packages/remix-react/index.tsx
+++ b/packages/remix-react/index.tsx
@@ -101,6 +101,7 @@ export type {
   ClientLoaderFunction,
   ClientLoaderFunctionArgs,
   MetaArgs,
+  MetaMatch as UNSAFE_MetaMatch,
   MetaDescriptor,
   MetaFunction,
   RouteModules as UNSAFE_RouteModules,
diff --git a/packages/remix-react/rollup.config.js b/packages/remix-react/rollup.config.js
index 5ad9ecd1c06..20d9673a71f 100644
--- a/packages/remix-react/rollup.config.js
+++ b/packages/remix-react/rollup.config.js
@@ -51,6 +51,7 @@ module.exports = function rollup() {
           { src: "LICENSE.md", dest: [outputDir, sourceDir] },
           { src: `${sourceDir}/package.json`, dest: outputDir },
           { src: `${sourceDir}/README.md`, dest: outputDir },
+          { src: `${sourceDir}/future`, dest: outputDir },
         ],
       }),
       copyToPlaygrounds(),

From a82b44e89e12543735b7963d33a580ec599390e2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 22 Apr 2024 15:59:20 -0400
Subject: [PATCH 075/108] chore: Update version for release (pre) (#9281)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json                                      | 3 ++-
 .../helpers/vite-cloudflare-template/package.json        | 6 +++---
 packages/create-remix/CHANGELOG.md                       | 2 ++
 packages/create-remix/package.json                       | 2 +-
 packages/remix-architect/CHANGELOG.md                    | 7 +++++++
 packages/remix-architect/package.json                    | 2 +-
 packages/remix-cloudflare-pages/CHANGELOG.md             | 7 +++++++
 packages/remix-cloudflare-pages/package.json             | 2 +-
 packages/remix-cloudflare-workers/CHANGELOG.md           | 7 +++++++
 packages/remix-cloudflare-workers/package.json           | 2 +-
 packages/remix-cloudflare/CHANGELOG.md                   | 7 +++++++
 packages/remix-cloudflare/package.json                   | 2 +-
 packages/remix-css-bundle/CHANGELOG.md                   | 2 ++
 packages/remix-css-bundle/package.json                   | 2 +-
 packages/remix-deno/CHANGELOG.md                         | 7 +++++++
 packages/remix-deno/package.json                         | 2 +-
 packages/remix-dev/CHANGELOG.md                          | 8 ++++++++
 packages/remix-dev/package.json                          | 6 +++---
 packages/remix-eslint-config/CHANGELOG.md                | 2 ++
 packages/remix-eslint-config/package.json                | 2 +-
 packages/remix-express/CHANGELOG.md                      | 7 +++++++
 packages/remix-express/package.json                      | 2 +-
 packages/remix-node/CHANGELOG.md                         | 7 +++++++
 packages/remix-node/package.json                         | 2 +-
 packages/remix-react/CHANGELOG.md                        | 9 +++++++++
 packages/remix-react/package.json                        | 2 +-
 packages/remix-serve/CHANGELOG.md                        | 8 ++++++++
 packages/remix-serve/package.json                        | 2 +-
 packages/remix-server-runtime/CHANGELOG.md               | 2 ++
 packages/remix-server-runtime/package.json               | 2 +-
 packages/remix-testing/CHANGELOG.md                      | 8 ++++++++
 packages/remix-testing/package.json                      | 2 +-
 packages/remix/package.json                              | 2 +-
 pnpm-lock.yaml                                           | 8 ++++----
 34 files changed, 117 insertions(+), 26 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index 8748d657d60..564968b5086 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -40,6 +40,7 @@
     "single-fetch-spa-mode",
     "single-fetch",
     "spicy-ghosts-watch",
-    "update-docs"
+    "update-docs",
+    "young-eagles-grab"
   ]
 }
diff --git a/integration/helpers/vite-cloudflare-template/package.json b/integration/helpers/vite-cloudflare-template/package.json
index 2e84cac7e88..b33994f289a 100644
--- a/integration/helpers/vite-cloudflare-template/package.json
+++ b/integration/helpers/vite-cloudflare-template/package.json
@@ -11,9 +11,9 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/cloudflare": "2.9.0-pre.4",
-    "@remix-run/cloudflare-pages": "2.9.0-pre.4",
-    "@remix-run/react": "2.9.0-pre.4",
+    "@remix-run/cloudflare": "2.9.0-pre.5",
+    "@remix-run/cloudflare-pages": "2.9.0-pre.5",
+    "@remix-run/react": "2.9.0-pre.5",
     "isbot": "^4.1.0",
     "miniflare": "^3.20231030.4",
     "react": "^18.2.0",
diff --git a/packages/create-remix/CHANGELOG.md b/packages/create-remix/CHANGELOG.md
index b4a81e1ad8e..7a06141354c 100644
--- a/packages/create-remix/CHANGELOG.md
+++ b/packages/create-remix/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `create-remix`
 
+## 2.9.0-pre.5
+
 ## 2.9.0-pre.4
 
 ## 2.9.0-pre.3
diff --git a/packages/create-remix/package.json b/packages/create-remix/package.json
index 66e488a3a7b..6e5af8a716d 100644
--- a/packages/create-remix/package.json
+++ b/packages/create-remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-remix",
-  "version": "2.9.0-pre.4",
+  "version": "2.9.0-pre.5",
   "description": "Create a new Remix app",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix-architect/CHANGELOG.md b/packages/remix-architect/CHANGELOG.md
index fb370429497..079c03fc9c6 100644
--- a/packages/remix-architect/CHANGELOG.md
+++ b/packages/remix-architect/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/architect`
 
+## 2.9.0-pre.5
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.5`
+
 ## 2.9.0-pre.4
 
 ### Patch Changes
diff --git a/packages/remix-architect/package.json b/packages/remix-architect/package.json
index 45a9c3c5903..070ea7a448c 100644
--- a/packages/remix-architect/package.json
+++ b/packages/remix-architect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/architect",
-  "version": "2.9.0-pre.4",
+  "version": "2.9.0-pre.5",
   "description": "Architect server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare-pages/CHANGELOG.md b/packages/remix-cloudflare-pages/CHANGELOG.md
index c332799cea3..d33970303d0 100644
--- a/packages/remix-cloudflare-pages/CHANGELOG.md
+++ b/packages/remix-cloudflare-pages/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-pages`
 
+## 2.9.0-pre.5
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/cloudflare@2.9.0-pre.5`
+
 ## 2.9.0-pre.4
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare-pages/package.json b/packages/remix-cloudflare-pages/package.json
index f8ac9a11d4e..b526f5772e7 100644
--- a/packages/remix-cloudflare-pages/package.json
+++ b/packages/remix-cloudflare-pages/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-pages",
-  "version": "2.9.0-pre.4",
+  "version": "2.9.0-pre.5",
   "description": "Cloudflare Pages request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare-workers/CHANGELOG.md b/packages/remix-cloudflare-workers/CHANGELOG.md
index f7bf7f7d3a4..eb09b56f04f 100644
--- a/packages/remix-cloudflare-workers/CHANGELOG.md
+++ b/packages/remix-cloudflare-workers/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-workers`
 
+## 2.9.0-pre.5
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/cloudflare@2.9.0-pre.5`
+
 ## 2.9.0-pre.4
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare-workers/package.json b/packages/remix-cloudflare-workers/package.json
index 0f227ca9f44..289ec0da0c5 100644
--- a/packages/remix-cloudflare-workers/package.json
+++ b/packages/remix-cloudflare-workers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-workers",
-  "version": "2.9.0-pre.4",
+  "version": "2.9.0-pre.5",
   "description": "Cloudflare worker request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare/CHANGELOG.md b/packages/remix-cloudflare/CHANGELOG.md
index 28de023fab8..53f50f7b498 100644
--- a/packages/remix-cloudflare/CHANGELOG.md
+++ b/packages/remix-cloudflare/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare`
 
+## 2.9.0-pre.5
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.5`
+
 ## 2.9.0-pre.4
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare/package.json b/packages/remix-cloudflare/package.json
index 0850e98748f..e656ae71898 100644
--- a/packages/remix-cloudflare/package.json
+++ b/packages/remix-cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare",
-  "version": "2.9.0-pre.4",
+  "version": "2.9.0-pre.5",
   "description": "Cloudflare platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-css-bundle/CHANGELOG.md b/packages/remix-css-bundle/CHANGELOG.md
index ef59d12190c..b7b2692ffee 100644
--- a/packages/remix-css-bundle/CHANGELOG.md
+++ b/packages/remix-css-bundle/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @remix-run/css-bundle
 
+## 2.9.0-pre.5
+
 ## 2.9.0-pre.4
 
 ## 2.9.0-pre.3
diff --git a/packages/remix-css-bundle/package.json b/packages/remix-css-bundle/package.json
index 209ab496740..fc6ac911b59 100644
--- a/packages/remix-css-bundle/package.json
+++ b/packages/remix-css-bundle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/css-bundle",
-  "version": "2.9.0-pre.4",
+  "version": "2.9.0-pre.5",
   "description": "CSS bundle href when using CSS bundling features in Remix",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix-deno/CHANGELOG.md b/packages/remix-deno/CHANGELOG.md
index 0188b9ea09f..12002ff4cf5 100644
--- a/packages/remix-deno/CHANGELOG.md
+++ b/packages/remix-deno/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/deno`
 
+## 2.9.0-pre.5
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.5`
+
 ## 2.9.0-pre.4
 
 ### Patch Changes
diff --git a/packages/remix-deno/package.json b/packages/remix-deno/package.json
index 268690a1caf..fc8bc6dc684 100644
--- a/packages/remix-deno/package.json
+++ b/packages/remix-deno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/deno",
-  "version": "2.9.0-pre.4",
+  "version": "2.9.0-pre.5",
   "description": "Deno platform abstractions for Remix",
   "homepage": "https://remix.run",
   "main": "./index.ts",
diff --git a/packages/remix-dev/CHANGELOG.md b/packages/remix-dev/CHANGELOG.md
index 261a41d53b8..ef5a8548f2b 100644
--- a/packages/remix-dev/CHANGELOG.md
+++ b/packages/remix-dev/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/dev`
 
+## 2.9.0-pre.5
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.5`
+  - `@remix-run/server-runtime@2.9.0-pre.5`
+
 ## 2.9.0-pre.4
 
 ### Patch Changes
diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json
index fe96980eeca..14346075e51 100644
--- a/packages/remix-dev/package.json
+++ b/packages/remix-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/dev",
-  "version": "2.9.0-pre.4",
+  "version": "2.9.0-pre.5",
   "description": "Dev tools and CLI for Remix",
   "homepage": "https://remix.run",
   "bugs": {
@@ -106,8 +106,8 @@
     "wrangler": "^3.28.2"
   },
   "peerDependencies": {
-    "@remix-run/react": "^2.9.0-pre.4",
-    "@remix-run/serve": "^2.9.0-pre.4",
+    "@remix-run/react": "^2.9.0-pre.5",
+    "@remix-run/serve": "^2.9.0-pre.5",
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2"
diff --git a/packages/remix-eslint-config/CHANGELOG.md b/packages/remix-eslint-config/CHANGELOG.md
index 8843dc1cc33..b9b17e54318 100644
--- a/packages/remix-eslint-config/CHANGELOG.md
+++ b/packages/remix-eslint-config/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `@remix-run/eslint-config`
 
+## 2.9.0-pre.5
+
 ## 2.9.0-pre.4
 
 ## 2.9.0-pre.3
diff --git a/packages/remix-eslint-config/package.json b/packages/remix-eslint-config/package.json
index 9ce9d42d8b4..70c71337bb5 100644
--- a/packages/remix-eslint-config/package.json
+++ b/packages/remix-eslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/eslint-config",
-  "version": "2.9.0-pre.4",
+  "version": "2.9.0-pre.5",
   "description": "ESLint configuration for Remix projects",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-express/CHANGELOG.md b/packages/remix-express/CHANGELOG.md
index 9a3447858e5..4b9f9a81483 100644
--- a/packages/remix-express/CHANGELOG.md
+++ b/packages/remix-express/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/express`
 
+## 2.9.0-pre.5
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.5`
+
 ## 2.9.0-pre.4
 
 ### Patch Changes
diff --git a/packages/remix-express/package.json b/packages/remix-express/package.json
index ca7d8b4779f..67bf04149c5 100644
--- a/packages/remix-express/package.json
+++ b/packages/remix-express/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/express",
-  "version": "2.9.0-pre.4",
+  "version": "2.9.0-pre.5",
   "description": "Express server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-node/CHANGELOG.md b/packages/remix-node/CHANGELOG.md
index 7e209bff41c..a38d17d5389 100644
--- a/packages/remix-node/CHANGELOG.md
+++ b/packages/remix-node/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/node`
 
+## 2.9.0-pre.5
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.5`
+
 ## 2.9.0-pre.4
 
 ### Patch Changes
diff --git a/packages/remix-node/package.json b/packages/remix-node/package.json
index 3fdd5e8d1e0..5a8c65e07f7 100644
--- a/packages/remix-node/package.json
+++ b/packages/remix-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/node",
-  "version": "2.9.0-pre.4",
+  "version": "2.9.0-pre.5",
   "description": "Node.js platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-react/CHANGELOG.md b/packages/remix-react/CHANGELOG.md
index 731e2bcbe2e..27e23016b3f 100644
--- a/packages/remix-react/CHANGELOG.md
+++ b/packages/remix-react/CHANGELOG.md
@@ -1,5 +1,14 @@
 # `@remix-run/react`
 
+## 2.9.0-pre.5
+
+### Patch Changes
+
+- Opt-in types for single-fetch ([#9272](https://github.com/remix-run/remix/pull/9272))
+  - To opt-in to type inference for single-fetch, add `./node_modules/@remix-run/react/future/single-fetch.d.ts` to `include` in your `tsconfig.json`
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.5`
+
 ## 2.9.0-pre.4
 
 ### Patch Changes
diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json
index 0cd60ef7f61..d6599b78d18 100644
--- a/packages/remix-react/package.json
+++ b/packages/remix-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/react",
-  "version": "2.9.0-pre.4",
+  "version": "2.9.0-pre.5",
   "description": "React DOM bindings for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-serve/CHANGELOG.md b/packages/remix-serve/CHANGELOG.md
index 3027782eed9..62ee835e038 100644
--- a/packages/remix-serve/CHANGELOG.md
+++ b/packages/remix-serve/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/serve`
 
+## 2.9.0-pre.5
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/express@2.9.0-pre.5`
+  - `@remix-run/node@2.9.0-pre.5`
+
 ## 2.9.0-pre.4
 
 ### Patch Changes
diff --git a/packages/remix-serve/package.json b/packages/remix-serve/package.json
index 42546de112c..acbdbe55530 100644
--- a/packages/remix-serve/package.json
+++ b/packages/remix-serve/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/serve",
-  "version": "2.9.0-pre.4",
+  "version": "2.9.0-pre.5",
   "description": "Production application server for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-server-runtime/CHANGELOG.md b/packages/remix-server-runtime/CHANGELOG.md
index 0ce730c4ebe..df98e4e4936 100644
--- a/packages/remix-server-runtime/CHANGELOG.md
+++ b/packages/remix-server-runtime/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `@remix-run/server-runtime`
 
+## 2.9.0-pre.5
+
 ## 2.9.0-pre.4
 
 ### Patch Changes
diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json
index d8078db104d..ddb588b902c 100644
--- a/packages/remix-server-runtime/package.json
+++ b/packages/remix-server-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/server-runtime",
-  "version": "2.9.0-pre.4",
+  "version": "2.9.0-pre.5",
   "description": "Server runtime for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-testing/CHANGELOG.md b/packages/remix-testing/CHANGELOG.md
index 4da1e10b314..f8bb3430969 100644
--- a/packages/remix-testing/CHANGELOG.md
+++ b/packages/remix-testing/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/testing`
 
+## 2.9.0-pre.5
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/react@2.9.0-pre.5`
+  - `@remix-run/node@2.9.0-pre.5`
+
 ## 2.9.0-pre.4
 
 ### Patch Changes
diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
index 7fd689961e6..bacf59d2c5c 100644
--- a/packages/remix-testing/package.json
+++ b/packages/remix-testing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/testing",
-  "version": "2.9.0-pre.4",
+  "version": "2.9.0-pre.5",
   "description": "Testing utilities for Remix apps",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix/package.json b/packages/remix/package.json
index 43f1ce3656a..36a8777058c 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "remix",
-  "version": "2.9.0-pre.4",
+  "version": "2.9.0-pre.5",
   "description": "A framework for building better websites",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f4a925dcbe9..e21167cd222 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -548,13 +548,13 @@ importers:
   integration/helpers/vite-cloudflare-template:
     dependencies:
       '@remix-run/cloudflare':
-        specifier: 2.9.0-pre.4
+        specifier: 2.9.0-pre.5
         version: link:../../../packages/remix-cloudflare
       '@remix-run/cloudflare-pages':
-        specifier: 2.9.0-pre.4
+        specifier: 2.9.0-pre.5
         version: link:../../../packages/remix-cloudflare-pages
       '@remix-run/react':
-        specifier: 2.9.0-pre.4
+        specifier: 2.9.0-pre.5
         version: link:../../../packages/remix-react
       isbot:
         specifier: ^4.1.0
@@ -868,7 +868,7 @@ importers:
         specifier: workspace:*
         version: link:../remix-node
       '@remix-run/react':
-        specifier: ^2.9.0-pre.4
+        specifier: ^2.9.0-pre.5
         version: link:../remix-react
       '@remix-run/router':
         specifier: 1.16.0-pre.1

From bd9b5d460df3a8484c2490c5801e4be944e4390e Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Mon, 22 Apr 2024 16:44:53 -0400
Subject: [PATCH 076/108] Include future folder in published package (#9282)

---
 .changeset/smooth-ways-march.md   | 5 +++++
 packages/remix-react/package.json | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 .changeset/smooth-ways-march.md

diff --git a/.changeset/smooth-ways-march.md b/.changeset/smooth-ways-march.md
new file mode 100644
index 00000000000..b85c4e22a05
--- /dev/null
+++ b/.changeset/smooth-ways-march.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/react": patch
+---
+
+[REMOVE] Include future folder in published package
diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json
index d6599b78d18..2947f593cd0 100644
--- a/packages/remix-react/package.json
+++ b/packages/remix-react/package.json
@@ -51,6 +51,7 @@
   },
   "files": [
     "dist/",
+    "future/",
     "CHANGELOG.md",
     "LICENSE.md",
     "README.md"

From d3a5f38f08765eb43f49b51fa98075ebb460f02d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 22 Apr 2024 16:50:15 -0400
Subject: [PATCH 077/108] chore: Update version for release (pre) (#9283)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json                                       | 1 +
 integration/helpers/vite-cloudflare-template/package.json | 6 +++---
 packages/create-remix/CHANGELOG.md                        | 2 ++
 packages/create-remix/package.json                        | 2 +-
 packages/remix-architect/CHANGELOG.md                     | 7 +++++++
 packages/remix-architect/package.json                     | 2 +-
 packages/remix-cloudflare-pages/CHANGELOG.md              | 7 +++++++
 packages/remix-cloudflare-pages/package.json              | 2 +-
 packages/remix-cloudflare-workers/CHANGELOG.md            | 7 +++++++
 packages/remix-cloudflare-workers/package.json            | 2 +-
 packages/remix-cloudflare/CHANGELOG.md                    | 7 +++++++
 packages/remix-cloudflare/package.json                    | 2 +-
 packages/remix-css-bundle/CHANGELOG.md                    | 2 ++
 packages/remix-css-bundle/package.json                    | 2 +-
 packages/remix-deno/CHANGELOG.md                          | 7 +++++++
 packages/remix-deno/package.json                          | 2 +-
 packages/remix-dev/CHANGELOG.md                           | 8 ++++++++
 packages/remix-dev/package.json                           | 6 +++---
 packages/remix-eslint-config/CHANGELOG.md                 | 2 ++
 packages/remix-eslint-config/package.json                 | 2 +-
 packages/remix-express/CHANGELOG.md                       | 7 +++++++
 packages/remix-express/package.json                       | 2 +-
 packages/remix-node/CHANGELOG.md                          | 7 +++++++
 packages/remix-node/package.json                          | 2 +-
 packages/remix-react/CHANGELOG.md                         | 8 ++++++++
 packages/remix-react/package.json                         | 2 +-
 packages/remix-serve/CHANGELOG.md                         | 8 ++++++++
 packages/remix-serve/package.json                         | 2 +-
 packages/remix-server-runtime/CHANGELOG.md                | 2 ++
 packages/remix-server-runtime/package.json                | 2 +-
 packages/remix-testing/CHANGELOG.md                       | 8 ++++++++
 packages/remix-testing/package.json                       | 2 +-
 packages/remix/package.json                               | 2 +-
 pnpm-lock.yaml                                            | 8 ++++----
 34 files changed, 115 insertions(+), 25 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index 564968b5086..f239a74d570 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -39,6 +39,7 @@
     "single-fetch-client-loaders",
     "single-fetch-spa-mode",
     "single-fetch",
+    "smooth-ways-march",
     "spicy-ghosts-watch",
     "update-docs",
     "young-eagles-grab"
diff --git a/integration/helpers/vite-cloudflare-template/package.json b/integration/helpers/vite-cloudflare-template/package.json
index b33994f289a..3d6196a657e 100644
--- a/integration/helpers/vite-cloudflare-template/package.json
+++ b/integration/helpers/vite-cloudflare-template/package.json
@@ -11,9 +11,9 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/cloudflare": "2.9.0-pre.5",
-    "@remix-run/cloudflare-pages": "2.9.0-pre.5",
-    "@remix-run/react": "2.9.0-pre.5",
+    "@remix-run/cloudflare": "2.9.0-pre.6",
+    "@remix-run/cloudflare-pages": "2.9.0-pre.6",
+    "@remix-run/react": "2.9.0-pre.6",
     "isbot": "^4.1.0",
     "miniflare": "^3.20231030.4",
     "react": "^18.2.0",
diff --git a/packages/create-remix/CHANGELOG.md b/packages/create-remix/CHANGELOG.md
index 7a06141354c..cacd19772a9 100644
--- a/packages/create-remix/CHANGELOG.md
+++ b/packages/create-remix/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `create-remix`
 
+## 2.9.0-pre.6
+
 ## 2.9.0-pre.5
 
 ## 2.9.0-pre.4
diff --git a/packages/create-remix/package.json b/packages/create-remix/package.json
index 6e5af8a716d..7fe427fbafd 100644
--- a/packages/create-remix/package.json
+++ b/packages/create-remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-remix",
-  "version": "2.9.0-pre.5",
+  "version": "2.9.0-pre.6",
   "description": "Create a new Remix app",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix-architect/CHANGELOG.md b/packages/remix-architect/CHANGELOG.md
index 079c03fc9c6..30b093f34cb 100644
--- a/packages/remix-architect/CHANGELOG.md
+++ b/packages/remix-architect/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/architect`
 
+## 2.9.0-pre.6
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.6`
+
 ## 2.9.0-pre.5
 
 ### Patch Changes
diff --git a/packages/remix-architect/package.json b/packages/remix-architect/package.json
index 070ea7a448c..91694c2d202 100644
--- a/packages/remix-architect/package.json
+++ b/packages/remix-architect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/architect",
-  "version": "2.9.0-pre.5",
+  "version": "2.9.0-pre.6",
   "description": "Architect server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare-pages/CHANGELOG.md b/packages/remix-cloudflare-pages/CHANGELOG.md
index d33970303d0..79c908fea56 100644
--- a/packages/remix-cloudflare-pages/CHANGELOG.md
+++ b/packages/remix-cloudflare-pages/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-pages`
 
+## 2.9.0-pre.6
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/cloudflare@2.9.0-pre.6`
+
 ## 2.9.0-pre.5
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare-pages/package.json b/packages/remix-cloudflare-pages/package.json
index b526f5772e7..2aa229381f3 100644
--- a/packages/remix-cloudflare-pages/package.json
+++ b/packages/remix-cloudflare-pages/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-pages",
-  "version": "2.9.0-pre.5",
+  "version": "2.9.0-pre.6",
   "description": "Cloudflare Pages request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare-workers/CHANGELOG.md b/packages/remix-cloudflare-workers/CHANGELOG.md
index eb09b56f04f..bcac4a17c57 100644
--- a/packages/remix-cloudflare-workers/CHANGELOG.md
+++ b/packages/remix-cloudflare-workers/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-workers`
 
+## 2.9.0-pre.6
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/cloudflare@2.9.0-pre.6`
+
 ## 2.9.0-pre.5
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare-workers/package.json b/packages/remix-cloudflare-workers/package.json
index 289ec0da0c5..31c1b6c9925 100644
--- a/packages/remix-cloudflare-workers/package.json
+++ b/packages/remix-cloudflare-workers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-workers",
-  "version": "2.9.0-pre.5",
+  "version": "2.9.0-pre.6",
   "description": "Cloudflare worker request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare/CHANGELOG.md b/packages/remix-cloudflare/CHANGELOG.md
index 53f50f7b498..2da6568beb0 100644
--- a/packages/remix-cloudflare/CHANGELOG.md
+++ b/packages/remix-cloudflare/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare`
 
+## 2.9.0-pre.6
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.6`
+
 ## 2.9.0-pre.5
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare/package.json b/packages/remix-cloudflare/package.json
index e656ae71898..a5640ba9b94 100644
--- a/packages/remix-cloudflare/package.json
+++ b/packages/remix-cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare",
-  "version": "2.9.0-pre.5",
+  "version": "2.9.0-pre.6",
   "description": "Cloudflare platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-css-bundle/CHANGELOG.md b/packages/remix-css-bundle/CHANGELOG.md
index b7b2692ffee..58c08055dc7 100644
--- a/packages/remix-css-bundle/CHANGELOG.md
+++ b/packages/remix-css-bundle/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @remix-run/css-bundle
 
+## 2.9.0-pre.6
+
 ## 2.9.0-pre.5
 
 ## 2.9.0-pre.4
diff --git a/packages/remix-css-bundle/package.json b/packages/remix-css-bundle/package.json
index fc6ac911b59..7e7c40e755a 100644
--- a/packages/remix-css-bundle/package.json
+++ b/packages/remix-css-bundle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/css-bundle",
-  "version": "2.9.0-pre.5",
+  "version": "2.9.0-pre.6",
   "description": "CSS bundle href when using CSS bundling features in Remix",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix-deno/CHANGELOG.md b/packages/remix-deno/CHANGELOG.md
index 12002ff4cf5..810d9192657 100644
--- a/packages/remix-deno/CHANGELOG.md
+++ b/packages/remix-deno/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/deno`
 
+## 2.9.0-pre.6
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.6`
+
 ## 2.9.0-pre.5
 
 ### Patch Changes
diff --git a/packages/remix-deno/package.json b/packages/remix-deno/package.json
index fc8bc6dc684..d96a7c5e1ce 100644
--- a/packages/remix-deno/package.json
+++ b/packages/remix-deno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/deno",
-  "version": "2.9.0-pre.5",
+  "version": "2.9.0-pre.6",
   "description": "Deno platform abstractions for Remix",
   "homepage": "https://remix.run",
   "main": "./index.ts",
diff --git a/packages/remix-dev/CHANGELOG.md b/packages/remix-dev/CHANGELOG.md
index ef5a8548f2b..64e8f61478b 100644
--- a/packages/remix-dev/CHANGELOG.md
+++ b/packages/remix-dev/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/dev`
 
+## 2.9.0-pre.6
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.6`
+  - `@remix-run/server-runtime@2.9.0-pre.6`
+
 ## 2.9.0-pre.5
 
 ### Patch Changes
diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json
index 14346075e51..81449f2e7a4 100644
--- a/packages/remix-dev/package.json
+++ b/packages/remix-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/dev",
-  "version": "2.9.0-pre.5",
+  "version": "2.9.0-pre.6",
   "description": "Dev tools and CLI for Remix",
   "homepage": "https://remix.run",
   "bugs": {
@@ -106,8 +106,8 @@
     "wrangler": "^3.28.2"
   },
   "peerDependencies": {
-    "@remix-run/react": "^2.9.0-pre.5",
-    "@remix-run/serve": "^2.9.0-pre.5",
+    "@remix-run/react": "^2.9.0-pre.6",
+    "@remix-run/serve": "^2.9.0-pre.6",
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2"
diff --git a/packages/remix-eslint-config/CHANGELOG.md b/packages/remix-eslint-config/CHANGELOG.md
index b9b17e54318..3b1a259b99f 100644
--- a/packages/remix-eslint-config/CHANGELOG.md
+++ b/packages/remix-eslint-config/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `@remix-run/eslint-config`
 
+## 2.9.0-pre.6
+
 ## 2.9.0-pre.5
 
 ## 2.9.0-pre.4
diff --git a/packages/remix-eslint-config/package.json b/packages/remix-eslint-config/package.json
index 70c71337bb5..6c0ea163469 100644
--- a/packages/remix-eslint-config/package.json
+++ b/packages/remix-eslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/eslint-config",
-  "version": "2.9.0-pre.5",
+  "version": "2.9.0-pre.6",
   "description": "ESLint configuration for Remix projects",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-express/CHANGELOG.md b/packages/remix-express/CHANGELOG.md
index 4b9f9a81483..13f7c5996bb 100644
--- a/packages/remix-express/CHANGELOG.md
+++ b/packages/remix-express/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/express`
 
+## 2.9.0-pre.6
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.6`
+
 ## 2.9.0-pre.5
 
 ### Patch Changes
diff --git a/packages/remix-express/package.json b/packages/remix-express/package.json
index 67bf04149c5..3143db50e35 100644
--- a/packages/remix-express/package.json
+++ b/packages/remix-express/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/express",
-  "version": "2.9.0-pre.5",
+  "version": "2.9.0-pre.6",
   "description": "Express server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-node/CHANGELOG.md b/packages/remix-node/CHANGELOG.md
index a38d17d5389..a58a1e50a39 100644
--- a/packages/remix-node/CHANGELOG.md
+++ b/packages/remix-node/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/node`
 
+## 2.9.0-pre.6
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.6`
+
 ## 2.9.0-pre.5
 
 ### Patch Changes
diff --git a/packages/remix-node/package.json b/packages/remix-node/package.json
index 5a8c65e07f7..b460509d6e9 100644
--- a/packages/remix-node/package.json
+++ b/packages/remix-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/node",
-  "version": "2.9.0-pre.5",
+  "version": "2.9.0-pre.6",
   "description": "Node.js platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-react/CHANGELOG.md b/packages/remix-react/CHANGELOG.md
index 27e23016b3f..a7310dcadd0 100644
--- a/packages/remix-react/CHANGELOG.md
+++ b/packages/remix-react/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/react`
 
+## 2.9.0-pre.6
+
+### Patch Changes
+
+- [REMOVE] Include future folder in published package ([#9282](https://github.com/remix-run/remix/pull/9282))
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.6`
+
 ## 2.9.0-pre.5
 
 ### Patch Changes
diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json
index 2947f593cd0..8a828441c59 100644
--- a/packages/remix-react/package.json
+++ b/packages/remix-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/react",
-  "version": "2.9.0-pre.5",
+  "version": "2.9.0-pre.6",
   "description": "React DOM bindings for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-serve/CHANGELOG.md b/packages/remix-serve/CHANGELOG.md
index 62ee835e038..d3a601e8052 100644
--- a/packages/remix-serve/CHANGELOG.md
+++ b/packages/remix-serve/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/serve`
 
+## 2.9.0-pre.6
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/express@2.9.0-pre.6`
+  - `@remix-run/node@2.9.0-pre.6`
+
 ## 2.9.0-pre.5
 
 ### Patch Changes
diff --git a/packages/remix-serve/package.json b/packages/remix-serve/package.json
index acbdbe55530..e396ce37863 100644
--- a/packages/remix-serve/package.json
+++ b/packages/remix-serve/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/serve",
-  "version": "2.9.0-pre.5",
+  "version": "2.9.0-pre.6",
   "description": "Production application server for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-server-runtime/CHANGELOG.md b/packages/remix-server-runtime/CHANGELOG.md
index df98e4e4936..3d1e91a08d2 100644
--- a/packages/remix-server-runtime/CHANGELOG.md
+++ b/packages/remix-server-runtime/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `@remix-run/server-runtime`
 
+## 2.9.0-pre.6
+
 ## 2.9.0-pre.5
 
 ## 2.9.0-pre.4
diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json
index ddb588b902c..5c8f81a2189 100644
--- a/packages/remix-server-runtime/package.json
+++ b/packages/remix-server-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/server-runtime",
-  "version": "2.9.0-pre.5",
+  "version": "2.9.0-pre.6",
   "description": "Server runtime for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-testing/CHANGELOG.md b/packages/remix-testing/CHANGELOG.md
index f8bb3430969..91f96f156ed 100644
--- a/packages/remix-testing/CHANGELOG.md
+++ b/packages/remix-testing/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/testing`
 
+## 2.9.0-pre.6
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/react@2.9.0-pre.6`
+  - `@remix-run/node@2.9.0-pre.6`
+
 ## 2.9.0-pre.5
 
 ### Patch Changes
diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
index bacf59d2c5c..3527e58f61e 100644
--- a/packages/remix-testing/package.json
+++ b/packages/remix-testing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/testing",
-  "version": "2.9.0-pre.5",
+  "version": "2.9.0-pre.6",
   "description": "Testing utilities for Remix apps",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix/package.json b/packages/remix/package.json
index 36a8777058c..8af8533ae44 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "remix",
-  "version": "2.9.0-pre.5",
+  "version": "2.9.0-pre.6",
   "description": "A framework for building better websites",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e21167cd222..2863aca8cf4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -548,13 +548,13 @@ importers:
   integration/helpers/vite-cloudflare-template:
     dependencies:
       '@remix-run/cloudflare':
-        specifier: 2.9.0-pre.5
+        specifier: 2.9.0-pre.6
         version: link:../../../packages/remix-cloudflare
       '@remix-run/cloudflare-pages':
-        specifier: 2.9.0-pre.5
+        specifier: 2.9.0-pre.6
         version: link:../../../packages/remix-cloudflare-pages
       '@remix-run/react':
-        specifier: 2.9.0-pre.5
+        specifier: 2.9.0-pre.6
         version: link:../../../packages/remix-react
       isbot:
         specifier: ^4.1.0
@@ -868,7 +868,7 @@ importers:
         specifier: workspace:*
         version: link:../remix-node
       '@remix-run/react':
-        specifier: ^2.9.0-pre.5
+        specifier: ^2.9.0-pre.6
         version: link:../remix-react
       '@remix-run/router':
         specifier: 1.16.0-pre.1

From 194788b930e2e627200349af19ca818146151244 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Mon, 22 Apr 2024 17:01:41 -0400
Subject: [PATCH 078/108] Fix single fetch types for synchronous loader/action
 functions

---
 .changeset/violet-trains-change.md            | 5 +++++
 packages/remix-react/future/single-fetch.d.ts | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/violet-trains-change.md

diff --git a/.changeset/violet-trains-change.md b/.changeset/violet-trains-change.md
new file mode 100644
index 00000000000..8cf0043b213
--- /dev/null
+++ b/.changeset/violet-trains-change.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/react": patch
+---
+
+[REMOVE] Fix return type when no promise is used
diff --git a/packages/remix-react/future/single-fetch.d.ts b/packages/remix-react/future/single-fetch.d.ts
index 3ea4d76b710..5356fcb7be6 100644
--- a/packages/remix-react/future/single-fetch.d.ts
+++ b/packages/remix-react/future/single-fetch.d.ts
@@ -36,10 +36,10 @@ type DataFunctionReturnValue =
 
 type LoaderFunction_SingleFetch = (
   args: LoaderFunctionArgs
-) => Promise<DataFunctionReturnValue>;
+) => Promise<DataFunctionReturnValue> | DataFunctionReturnValue;
 type ActionFunction_SingleFetch = (
   args: ActionFunctionArgs
-) => Promise<DataFunctionReturnValue>;
+) => Promise<DataFunctionReturnValue> | DataFunctionReturnValue;
 
 // Backwards-compatible type for Remix v2 where json/defer still use the old types,
 // and only non-json/defer returns use the new types.  This allows for incremental

From d54f68981ee8b68b309301c7445499709314ae23 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 22 Apr 2024 17:03:13 -0400
Subject: [PATCH 079/108] chore: Update version for release (pre) (#9284)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json                                       | 1 +
 integration/helpers/vite-cloudflare-template/package.json | 6 +++---
 packages/create-remix/CHANGELOG.md                        | 2 ++
 packages/create-remix/package.json                        | 2 +-
 packages/remix-architect/CHANGELOG.md                     | 7 +++++++
 packages/remix-architect/package.json                     | 2 +-
 packages/remix-cloudflare-pages/CHANGELOG.md              | 7 +++++++
 packages/remix-cloudflare-pages/package.json              | 2 +-
 packages/remix-cloudflare-workers/CHANGELOG.md            | 7 +++++++
 packages/remix-cloudflare-workers/package.json            | 2 +-
 packages/remix-cloudflare/CHANGELOG.md                    | 7 +++++++
 packages/remix-cloudflare/package.json                    | 2 +-
 packages/remix-css-bundle/CHANGELOG.md                    | 2 ++
 packages/remix-css-bundle/package.json                    | 2 +-
 packages/remix-deno/CHANGELOG.md                          | 7 +++++++
 packages/remix-deno/package.json                          | 2 +-
 packages/remix-dev/CHANGELOG.md                           | 8 ++++++++
 packages/remix-dev/package.json                           | 6 +++---
 packages/remix-eslint-config/CHANGELOG.md                 | 2 ++
 packages/remix-eslint-config/package.json                 | 2 +-
 packages/remix-express/CHANGELOG.md                       | 7 +++++++
 packages/remix-express/package.json                       | 2 +-
 packages/remix-node/CHANGELOG.md                          | 7 +++++++
 packages/remix-node/package.json                          | 2 +-
 packages/remix-react/CHANGELOG.md                         | 8 ++++++++
 packages/remix-react/package.json                         | 2 +-
 packages/remix-serve/CHANGELOG.md                         | 8 ++++++++
 packages/remix-serve/package.json                         | 2 +-
 packages/remix-server-runtime/CHANGELOG.md                | 2 ++
 packages/remix-server-runtime/package.json                | 2 +-
 packages/remix-testing/CHANGELOG.md                       | 8 ++++++++
 packages/remix-testing/package.json                       | 2 +-
 packages/remix/package.json                               | 2 +-
 pnpm-lock.yaml                                            | 8 ++++----
 34 files changed, 115 insertions(+), 25 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index f239a74d570..b786dc8db27 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -42,6 +42,7 @@
     "smooth-ways-march",
     "spicy-ghosts-watch",
     "update-docs",
+    "violet-trains-change",
     "young-eagles-grab"
   ]
 }
diff --git a/integration/helpers/vite-cloudflare-template/package.json b/integration/helpers/vite-cloudflare-template/package.json
index 3d6196a657e..9e188b32405 100644
--- a/integration/helpers/vite-cloudflare-template/package.json
+++ b/integration/helpers/vite-cloudflare-template/package.json
@@ -11,9 +11,9 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/cloudflare": "2.9.0-pre.6",
-    "@remix-run/cloudflare-pages": "2.9.0-pre.6",
-    "@remix-run/react": "2.9.0-pre.6",
+    "@remix-run/cloudflare": "2.9.0-pre.7",
+    "@remix-run/cloudflare-pages": "2.9.0-pre.7",
+    "@remix-run/react": "2.9.0-pre.7",
     "isbot": "^4.1.0",
     "miniflare": "^3.20231030.4",
     "react": "^18.2.0",
diff --git a/packages/create-remix/CHANGELOG.md b/packages/create-remix/CHANGELOG.md
index cacd19772a9..d619a2fe299 100644
--- a/packages/create-remix/CHANGELOG.md
+++ b/packages/create-remix/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `create-remix`
 
+## 2.9.0-pre.7
+
 ## 2.9.0-pre.6
 
 ## 2.9.0-pre.5
diff --git a/packages/create-remix/package.json b/packages/create-remix/package.json
index 7fe427fbafd..e65d9b67988 100644
--- a/packages/create-remix/package.json
+++ b/packages/create-remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-remix",
-  "version": "2.9.0-pre.6",
+  "version": "2.9.0-pre.7",
   "description": "Create a new Remix app",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix-architect/CHANGELOG.md b/packages/remix-architect/CHANGELOG.md
index 30b093f34cb..7db2a0c88e6 100644
--- a/packages/remix-architect/CHANGELOG.md
+++ b/packages/remix-architect/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/architect`
 
+## 2.9.0-pre.7
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.7`
+
 ## 2.9.0-pre.6
 
 ### Patch Changes
diff --git a/packages/remix-architect/package.json b/packages/remix-architect/package.json
index 91694c2d202..3f3187ea2f8 100644
--- a/packages/remix-architect/package.json
+++ b/packages/remix-architect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/architect",
-  "version": "2.9.0-pre.6",
+  "version": "2.9.0-pre.7",
   "description": "Architect server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare-pages/CHANGELOG.md b/packages/remix-cloudflare-pages/CHANGELOG.md
index 79c908fea56..fcbafadb786 100644
--- a/packages/remix-cloudflare-pages/CHANGELOG.md
+++ b/packages/remix-cloudflare-pages/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-pages`
 
+## 2.9.0-pre.7
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/cloudflare@2.9.0-pre.7`
+
 ## 2.9.0-pre.6
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare-pages/package.json b/packages/remix-cloudflare-pages/package.json
index 2aa229381f3..18f0b3eda81 100644
--- a/packages/remix-cloudflare-pages/package.json
+++ b/packages/remix-cloudflare-pages/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-pages",
-  "version": "2.9.0-pre.6",
+  "version": "2.9.0-pre.7",
   "description": "Cloudflare Pages request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare-workers/CHANGELOG.md b/packages/remix-cloudflare-workers/CHANGELOG.md
index bcac4a17c57..8fb61c62187 100644
--- a/packages/remix-cloudflare-workers/CHANGELOG.md
+++ b/packages/remix-cloudflare-workers/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-workers`
 
+## 2.9.0-pre.7
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/cloudflare@2.9.0-pre.7`
+
 ## 2.9.0-pre.6
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare-workers/package.json b/packages/remix-cloudflare-workers/package.json
index 31c1b6c9925..1ecbb27010f 100644
--- a/packages/remix-cloudflare-workers/package.json
+++ b/packages/remix-cloudflare-workers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-workers",
-  "version": "2.9.0-pre.6",
+  "version": "2.9.0-pre.7",
   "description": "Cloudflare worker request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare/CHANGELOG.md b/packages/remix-cloudflare/CHANGELOG.md
index 2da6568beb0..f68bee99b19 100644
--- a/packages/remix-cloudflare/CHANGELOG.md
+++ b/packages/remix-cloudflare/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare`
 
+## 2.9.0-pre.7
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.7`
+
 ## 2.9.0-pre.6
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare/package.json b/packages/remix-cloudflare/package.json
index a5640ba9b94..a6af746d51e 100644
--- a/packages/remix-cloudflare/package.json
+++ b/packages/remix-cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare",
-  "version": "2.9.0-pre.6",
+  "version": "2.9.0-pre.7",
   "description": "Cloudflare platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-css-bundle/CHANGELOG.md b/packages/remix-css-bundle/CHANGELOG.md
index 58c08055dc7..819c573454c 100644
--- a/packages/remix-css-bundle/CHANGELOG.md
+++ b/packages/remix-css-bundle/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @remix-run/css-bundle
 
+## 2.9.0-pre.7
+
 ## 2.9.0-pre.6
 
 ## 2.9.0-pre.5
diff --git a/packages/remix-css-bundle/package.json b/packages/remix-css-bundle/package.json
index 7e7c40e755a..9b090934752 100644
--- a/packages/remix-css-bundle/package.json
+++ b/packages/remix-css-bundle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/css-bundle",
-  "version": "2.9.0-pre.6",
+  "version": "2.9.0-pre.7",
   "description": "CSS bundle href when using CSS bundling features in Remix",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix-deno/CHANGELOG.md b/packages/remix-deno/CHANGELOG.md
index 810d9192657..dd11cc3fcd2 100644
--- a/packages/remix-deno/CHANGELOG.md
+++ b/packages/remix-deno/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/deno`
 
+## 2.9.0-pre.7
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.7`
+
 ## 2.9.0-pre.6
 
 ### Patch Changes
diff --git a/packages/remix-deno/package.json b/packages/remix-deno/package.json
index d96a7c5e1ce..f4974b6f7ea 100644
--- a/packages/remix-deno/package.json
+++ b/packages/remix-deno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/deno",
-  "version": "2.9.0-pre.6",
+  "version": "2.9.0-pre.7",
   "description": "Deno platform abstractions for Remix",
   "homepage": "https://remix.run",
   "main": "./index.ts",
diff --git a/packages/remix-dev/CHANGELOG.md b/packages/remix-dev/CHANGELOG.md
index 64e8f61478b..9968187eb0e 100644
--- a/packages/remix-dev/CHANGELOG.md
+++ b/packages/remix-dev/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/dev`
 
+## 2.9.0-pre.7
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.7`
+  - `@remix-run/server-runtime@2.9.0-pre.7`
+
 ## 2.9.0-pre.6
 
 ### Patch Changes
diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json
index 81449f2e7a4..e5df2c813c7 100644
--- a/packages/remix-dev/package.json
+++ b/packages/remix-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/dev",
-  "version": "2.9.0-pre.6",
+  "version": "2.9.0-pre.7",
   "description": "Dev tools and CLI for Remix",
   "homepage": "https://remix.run",
   "bugs": {
@@ -106,8 +106,8 @@
     "wrangler": "^3.28.2"
   },
   "peerDependencies": {
-    "@remix-run/react": "^2.9.0-pre.6",
-    "@remix-run/serve": "^2.9.0-pre.6",
+    "@remix-run/react": "^2.9.0-pre.7",
+    "@remix-run/serve": "^2.9.0-pre.7",
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2"
diff --git a/packages/remix-eslint-config/CHANGELOG.md b/packages/remix-eslint-config/CHANGELOG.md
index 3b1a259b99f..2554ade4052 100644
--- a/packages/remix-eslint-config/CHANGELOG.md
+++ b/packages/remix-eslint-config/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `@remix-run/eslint-config`
 
+## 2.9.0-pre.7
+
 ## 2.9.0-pre.6
 
 ## 2.9.0-pre.5
diff --git a/packages/remix-eslint-config/package.json b/packages/remix-eslint-config/package.json
index 6c0ea163469..971c67ba091 100644
--- a/packages/remix-eslint-config/package.json
+++ b/packages/remix-eslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/eslint-config",
-  "version": "2.9.0-pre.6",
+  "version": "2.9.0-pre.7",
   "description": "ESLint configuration for Remix projects",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-express/CHANGELOG.md b/packages/remix-express/CHANGELOG.md
index 13f7c5996bb..a1a391d89d6 100644
--- a/packages/remix-express/CHANGELOG.md
+++ b/packages/remix-express/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/express`
 
+## 2.9.0-pre.7
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.7`
+
 ## 2.9.0-pre.6
 
 ### Patch Changes
diff --git a/packages/remix-express/package.json b/packages/remix-express/package.json
index 3143db50e35..af95f6ac549 100644
--- a/packages/remix-express/package.json
+++ b/packages/remix-express/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/express",
-  "version": "2.9.0-pre.6",
+  "version": "2.9.0-pre.7",
   "description": "Express server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-node/CHANGELOG.md b/packages/remix-node/CHANGELOG.md
index a58a1e50a39..b0b0febf63a 100644
--- a/packages/remix-node/CHANGELOG.md
+++ b/packages/remix-node/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/node`
 
+## 2.9.0-pre.7
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.7`
+
 ## 2.9.0-pre.6
 
 ### Patch Changes
diff --git a/packages/remix-node/package.json b/packages/remix-node/package.json
index b460509d6e9..878c5c16333 100644
--- a/packages/remix-node/package.json
+++ b/packages/remix-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/node",
-  "version": "2.9.0-pre.6",
+  "version": "2.9.0-pre.7",
   "description": "Node.js platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-react/CHANGELOG.md b/packages/remix-react/CHANGELOG.md
index a7310dcadd0..4fcd31d960b 100644
--- a/packages/remix-react/CHANGELOG.md
+++ b/packages/remix-react/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/react`
 
+## 2.9.0-pre.7
+
+### Patch Changes
+
+- [REMOVE] Fix return type when no promise is used ([`194788b93`](https://github.com/remix-run/remix/commit/194788b930e2e627200349af19ca818146151244))
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.7`
+
 ## 2.9.0-pre.6
 
 ### Patch Changes
diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json
index 8a828441c59..2950e7a4864 100644
--- a/packages/remix-react/package.json
+++ b/packages/remix-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/react",
-  "version": "2.9.0-pre.6",
+  "version": "2.9.0-pre.7",
   "description": "React DOM bindings for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-serve/CHANGELOG.md b/packages/remix-serve/CHANGELOG.md
index d3a601e8052..96d3cd09954 100644
--- a/packages/remix-serve/CHANGELOG.md
+++ b/packages/remix-serve/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/serve`
 
+## 2.9.0-pre.7
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/express@2.9.0-pre.7`
+  - `@remix-run/node@2.9.0-pre.7`
+
 ## 2.9.0-pre.6
 
 ### Patch Changes
diff --git a/packages/remix-serve/package.json b/packages/remix-serve/package.json
index e396ce37863..4e1ccc4d265 100644
--- a/packages/remix-serve/package.json
+++ b/packages/remix-serve/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/serve",
-  "version": "2.9.0-pre.6",
+  "version": "2.9.0-pre.7",
   "description": "Production application server for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-server-runtime/CHANGELOG.md b/packages/remix-server-runtime/CHANGELOG.md
index 3d1e91a08d2..386666f4e38 100644
--- a/packages/remix-server-runtime/CHANGELOG.md
+++ b/packages/remix-server-runtime/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `@remix-run/server-runtime`
 
+## 2.9.0-pre.7
+
 ## 2.9.0-pre.6
 
 ## 2.9.0-pre.5
diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json
index 5c8f81a2189..0c716e8bc89 100644
--- a/packages/remix-server-runtime/package.json
+++ b/packages/remix-server-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/server-runtime",
-  "version": "2.9.0-pre.6",
+  "version": "2.9.0-pre.7",
   "description": "Server runtime for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-testing/CHANGELOG.md b/packages/remix-testing/CHANGELOG.md
index 91f96f156ed..8549d255683 100644
--- a/packages/remix-testing/CHANGELOG.md
+++ b/packages/remix-testing/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/testing`
 
+## 2.9.0-pre.7
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/react@2.9.0-pre.7`
+  - `@remix-run/node@2.9.0-pre.7`
+
 ## 2.9.0-pre.6
 
 ### Patch Changes
diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
index 3527e58f61e..02fd9af0fec 100644
--- a/packages/remix-testing/package.json
+++ b/packages/remix-testing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/testing",
-  "version": "2.9.0-pre.6",
+  "version": "2.9.0-pre.7",
   "description": "Testing utilities for Remix apps",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix/package.json b/packages/remix/package.json
index 8af8533ae44..d4067c40896 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "remix",
-  "version": "2.9.0-pre.6",
+  "version": "2.9.0-pre.7",
   "description": "A framework for building better websites",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2863aca8cf4..93be1582aa5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -548,13 +548,13 @@ importers:
   integration/helpers/vite-cloudflare-template:
     dependencies:
       '@remix-run/cloudflare':
-        specifier: 2.9.0-pre.6
+        specifier: 2.9.0-pre.7
         version: link:../../../packages/remix-cloudflare
       '@remix-run/cloudflare-pages':
-        specifier: 2.9.0-pre.6
+        specifier: 2.9.0-pre.7
         version: link:../../../packages/remix-cloudflare-pages
       '@remix-run/react':
-        specifier: 2.9.0-pre.6
+        specifier: 2.9.0-pre.7
         version: link:../../../packages/remix-react
       isbot:
         specifier: ^4.1.0
@@ -868,7 +868,7 @@ importers:
         specifier: workspace:*
         version: link:../remix-node
       '@remix-run/react':
-        specifier: ^2.9.0-pre.6
+        specifier: ^2.9.0-pre.7
         version: link:../remix-react
       '@remix-run/router':
         specifier: 1.16.0-pre.1

From 76d8c008431ceaeef5e60bfde8c0fd6d5779c41c Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Mon, 22 Apr 2024 17:15:20 -0400
Subject: [PATCH 080/108] update docs

---
 docs/guides/single-fetch.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/guides/single-fetch.md b/docs/guides/single-fetch.md
index 8f66f81e651..8eef8460577 100644
--- a/docs/guides/single-fetch.md
+++ b/docs/guides/single-fetch.md
@@ -14,6 +14,7 @@ When you enable Single Fetch, Remix will make a single HTTP call to your server
 
 - Single fetch uses a new streaming format under the hood via [`turbo-stream`][turbo-stream], which means that we can stream down more complex data than just JSON
 - Naked objects returned from `loader` and `action` functions are no longer automatically converted into a JSON `Response` and are serialized as-is over the wire
+- You must add `node_modules/@remix-run/react/future/single-fetch.d.ts` to the end of your `tsconfig.json`'s `include` array to get proper type inference
 - Revalidation after an `action` `4xx`/`5xx` `Response` is now opt-in, versus opt-out
 - The [`headers`][headers] function is no longer used when Single Fetch is enabled, in favor of the new `response` stub passed to your `loader`/`action` functions
 
@@ -61,7 +62,7 @@ In order to ensure you get the proper types when using Single Fetch, we've inclu
 {
   "include": [
     // ...
-    "./node_modules/@remix-run/react/future/single-fetch.d.ts"
+    "node_modules/@remix-run/react/future/single-fetch.d.ts"
   ]
 }
 ```

From 04e9e237df0a480b1dcce131e3ca21365fa057b6 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Tue, 23 Apr 2024 10:15:47 -0400
Subject: [PATCH 081/108] Exit prerelease mode

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

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

From 0e2cb68b39ec4d113f19e85be3e6759f19591abc Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Tue, 23 Apr 2024 11:09:51 -0400
Subject: [PATCH 082/108] Revert "Exit prerelease mode"

This reverts commit 04e9e237df0a480b1dcce131e3ca21365fa057b6.
---
 .changeset/pre.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From c862f7c23e260075f1389ad7c2bfaa74779c5726 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Tue, 23 Apr 2024 11:50:57 -0400
Subject: [PATCH 083/108] Bump router to stable (#9289)

---
 .changeset/shiny-ravens-cross.md           |  5 +++
 integration/package.json                   |  2 +-
 packages/remix-dev/package.json            |  2 +-
 packages/remix-react/package.json          |  6 +--
 packages/remix-server-runtime/package.json |  2 +-
 packages/remix-testing/package.json        |  4 +-
 pnpm-lock.yaml                             | 50 +++++++++++-----------
 7 files changed, 38 insertions(+), 33 deletions(-)
 create mode 100644 .changeset/shiny-ravens-cross.md

diff --git a/.changeset/shiny-ravens-cross.md b/.changeset/shiny-ravens-cross.md
new file mode 100644
index 00000000000..a1eccc4f5ef
--- /dev/null
+++ b/.changeset/shiny-ravens-cross.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/react": patch
+---
+
+[REMOVE] bump router
diff --git a/integration/package.json b/integration/package.json
index a0a7f7e7aba..3e59031d9f9 100644
--- a/integration/package.json
+++ b/integration/package.json
@@ -14,7 +14,7 @@
     "@remix-run/dev": "workspace:*",
     "@remix-run/express": "workspace:*",
     "@remix-run/node": "workspace:*",
-    "@remix-run/router": "1.16.0-pre.1",
+    "@remix-run/router": "1.16.0",
     "@remix-run/server-runtime": "workspace:*",
     "@types/express": "^4.17.9",
     "@vanilla-extract/css": "^1.10.0",
diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json
index e5df2c813c7..1c52f149de4 100644
--- a/packages/remix-dev/package.json
+++ b/packages/remix-dev/package.json
@@ -32,7 +32,7 @@
     "@mdx-js/mdx": "^2.3.0",
     "@npmcli/package-json": "^4.0.1",
     "@remix-run/node": "workspace:*",
-    "@remix-run/router": "1.16.0-pre.1",
+    "@remix-run/router": "1.16.0",
     "@remix-run/server-runtime": "workspace:*",
     "@types/mdx": "^2.0.5",
     "@vanilla-extract/integration": "^6.2.0",
diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json
index 2950e7a4864..a085270cc97 100644
--- a/packages/remix-react/package.json
+++ b/packages/remix-react/package.json
@@ -19,10 +19,10 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@remix-run/router": "1.16.0-pre.1",
+    "@remix-run/router": "1.16.0",
     "@remix-run/server-runtime": "workspace:*",
-    "react-router": "6.23.0-pre.1",
-    "react-router-dom": "6.23.0-pre.1",
+    "react-router": "6.23.0",
+    "react-router-dom": "6.23.0",
     "turbo-stream": "^2.0.0"
   },
   "devDependencies": {
diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json
index 0c716e8bc89..a10ca110b6d 100644
--- a/packages/remix-server-runtime/package.json
+++ b/packages/remix-server-runtime/package.json
@@ -19,7 +19,7 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@remix-run/router": "1.16.0-pre.1",
+    "@remix-run/router": "1.16.0",
     "@types/cookie": "^0.6.0",
     "@web3-storage/multipart-parser": "^1.0.0",
     "cookie": "^0.6.0",
diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
index 02fd9af0fec..5c354bc691c 100644
--- a/packages/remix-testing/package.json
+++ b/packages/remix-testing/package.json
@@ -21,8 +21,8 @@
   "dependencies": {
     "@remix-run/node": "workspace:*",
     "@remix-run/react": "workspace:*",
-    "@remix-run/router": "1.16.0-pre.1",
-    "react-router-dom": "6.23.0-pre.1"
+    "@remix-run/router": "1.16.0",
+    "react-router-dom": "6.23.0"
   },
   "devDependencies": {
     "@remix-run/server-runtime": "workspace:*",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 93be1582aa5..1a3254eaff5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -323,8 +323,8 @@ importers:
         specifier: workspace:*
         version: link:../packages/remix-node
       '@remix-run/router':
-        specifier: 1.16.0-pre.1
-        version: 1.16.0-pre.1
+        specifier: 1.16.0
+        version: 1.16.0
       '@remix-run/server-runtime':
         specifier: workspace:*
         version: link:../packages/remix-server-runtime
@@ -871,8 +871,8 @@ importers:
         specifier: ^2.9.0-pre.7
         version: link:../remix-react
       '@remix-run/router':
-        specifier: 1.16.0-pre.1
-        version: 1.16.0-pre.1
+        specifier: 1.16.0
+        version: 1.16.0
       '@remix-run/server-runtime':
         specifier: workspace:*
         version: link:../remix-server-runtime
@@ -1217,17 +1217,17 @@ importers:
   packages/remix-react:
     dependencies:
       '@remix-run/router':
-        specifier: 1.16.0-pre.1
-        version: 1.16.0-pre.1
+        specifier: 1.16.0
+        version: 1.16.0
       '@remix-run/server-runtime':
         specifier: workspace:*
         version: link:../remix-server-runtime
       react-router:
-        specifier: 6.23.0-pre.1
-        version: 6.23.0-pre.1(react@18.2.0)
+        specifier: 6.23.0
+        version: 6.23.0(react@18.2.0)
       react-router-dom:
-        specifier: 6.23.0-pre.1
-        version: 6.23.0-pre.1(react-dom@18.2.0)(react@18.2.0)
+        specifier: 6.23.0
+        version: 6.23.0(react-dom@18.2.0)(react@18.2.0)
       turbo-stream:
         specifier: ^2.0.0
         version: 2.0.0
@@ -1303,8 +1303,8 @@ importers:
   packages/remix-server-runtime:
     dependencies:
       '@remix-run/router':
-        specifier: 1.16.0-pre.1
-        version: 1.16.0-pre.1
+        specifier: 1.16.0
+        version: 1.16.0
       '@types/cookie':
         specifier: ^0.6.0
         version: 0.6.0
@@ -1340,11 +1340,11 @@ importers:
         specifier: workspace:*
         version: link:../remix-react
       '@remix-run/router':
-        specifier: 1.16.0-pre.1
-        version: 1.16.0-pre.1
+        specifier: 1.16.0
+        version: 1.16.0
       react-router-dom:
-        specifier: 6.23.0-pre.1
-        version: 6.23.0-pre.1(react-dom@18.2.0)(react@18.2.0)
+        specifier: 6.23.0
+        version: 6.23.0(react-dom@18.2.0)(react@18.2.0)
     devDependencies:
       '@remix-run/server-runtime':
         specifier: workspace:*
@@ -4199,8 +4199,8 @@ packages:
       - encoding
     dev: false
 
-  /@remix-run/router@1.16.0-pre.1:
-    resolution: {integrity: sha512-zmaT9ICBPTMyoerhGgydSZVdBbEysM7SHan4pJUBIPe66ofscEv60OCjPyX+ZcH2ihjspj3tN2/ZnYAIZmEzjA==}
+  /@remix-run/router@1.16.0:
+    resolution: {integrity: sha512-Quz1KOffeEf/zwkCBM3kBtH4ZoZ+pT3xIXBG4PPW/XFtDP7EGhtTiC2+gpL9GnR7+Qdet5Oa6cYSvwKYg6kN9Q==}
     engines: {node: '>=14.0.0'}
     dev: false
 
@@ -12816,26 +12816,26 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: false
 
-  /react-router-dom@6.23.0-pre.1(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-iZnPPBGCvg/gGzzKCqaXoPJjdVQwjJ4aJj2UTatJvzIQq6c586BS7u8WzpHy2pmbri58btGj4eLIgF7jv1Fgvw==}
+  /react-router-dom@6.23.0(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-Q9YaSYvubwgbal2c9DJKfx6hTNoBp3iJDsl+Duva/DwxoJH+OTXkxGpql4iUK2sla/8z4RpjAm6EWx1qUDuopQ==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
       react: '>=16.8'
       react-dom: '>=16.8'
     dependencies:
-      '@remix-run/router': 1.16.0-pre.1
+      '@remix-run/router': 1.16.0
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      react-router: 6.23.0-pre.1(react@18.2.0)
+      react-router: 6.23.0(react@18.2.0)
     dev: false
 
-  /react-router@6.23.0-pre.1(react@18.2.0):
-    resolution: {integrity: sha512-lijdeB51mv3Cxij+ymI/NcGCb0D9KjXPuvqFXxeUIyMtevHh6i1viDD/0U+gknla1ZfawhWKfwkn4XAD2T7KTA==}
+  /react-router@6.23.0(react@18.2.0):
+    resolution: {integrity: sha512-wPMZ8S2TuPadH0sF5irFGjkNLIcRvOSaEe7v+JER8508dyJumm6XZB1u5kztlX0RVq6AzRVndzqcUh6sFIauzA==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
       react: '>=16.8'
     dependencies:
-      '@remix-run/router': 1.16.0-pre.1
+      '@remix-run/router': 1.16.0
       react: 18.2.0
     dev: false
 

From ead3b5c310384dd7d4e7ce4b180595a8113284eb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 23 Apr 2024 11:52:13 -0400
Subject: [PATCH 084/108] chore: Update version for release (pre) (#9290)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json                                       | 1 +
 integration/helpers/vite-cloudflare-template/package.json | 6 +++---
 packages/create-remix/CHANGELOG.md                        | 2 ++
 packages/create-remix/package.json                        | 2 +-
 packages/remix-architect/CHANGELOG.md                     | 7 +++++++
 packages/remix-architect/package.json                     | 2 +-
 packages/remix-cloudflare-pages/CHANGELOG.md              | 7 +++++++
 packages/remix-cloudflare-pages/package.json              | 2 +-
 packages/remix-cloudflare-workers/CHANGELOG.md            | 7 +++++++
 packages/remix-cloudflare-workers/package.json            | 2 +-
 packages/remix-cloudflare/CHANGELOG.md                    | 7 +++++++
 packages/remix-cloudflare/package.json                    | 2 +-
 packages/remix-css-bundle/CHANGELOG.md                    | 2 ++
 packages/remix-css-bundle/package.json                    | 2 +-
 packages/remix-deno/CHANGELOG.md                          | 7 +++++++
 packages/remix-deno/package.json                          | 2 +-
 packages/remix-dev/CHANGELOG.md                           | 8 ++++++++
 packages/remix-dev/package.json                           | 6 +++---
 packages/remix-eslint-config/CHANGELOG.md                 | 2 ++
 packages/remix-eslint-config/package.json                 | 2 +-
 packages/remix-express/CHANGELOG.md                       | 7 +++++++
 packages/remix-express/package.json                       | 2 +-
 packages/remix-node/CHANGELOG.md                          | 7 +++++++
 packages/remix-node/package.json                          | 2 +-
 packages/remix-react/CHANGELOG.md                         | 8 ++++++++
 packages/remix-react/package.json                         | 2 +-
 packages/remix-serve/CHANGELOG.md                         | 8 ++++++++
 packages/remix-serve/package.json                         | 2 +-
 packages/remix-server-runtime/CHANGELOG.md                | 2 ++
 packages/remix-server-runtime/package.json                | 2 +-
 packages/remix-testing/CHANGELOG.md                       | 8 ++++++++
 packages/remix-testing/package.json                       | 2 +-
 packages/remix/package.json                               | 2 +-
 pnpm-lock.yaml                                            | 8 ++++----
 34 files changed, 115 insertions(+), 25 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index b786dc8db27..185e9e934a9 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -35,6 +35,7 @@
     "odd-frogs-attend",
     "popular-adults-remain",
     "response-stub",
+    "shiny-ravens-cross",
     "shy-buttons-buy",
     "single-fetch-client-loaders",
     "single-fetch-spa-mode",
diff --git a/integration/helpers/vite-cloudflare-template/package.json b/integration/helpers/vite-cloudflare-template/package.json
index 9e188b32405..2a25b31f493 100644
--- a/integration/helpers/vite-cloudflare-template/package.json
+++ b/integration/helpers/vite-cloudflare-template/package.json
@@ -11,9 +11,9 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/cloudflare": "2.9.0-pre.7",
-    "@remix-run/cloudflare-pages": "2.9.0-pre.7",
-    "@remix-run/react": "2.9.0-pre.7",
+    "@remix-run/cloudflare": "2.9.0-pre.8",
+    "@remix-run/cloudflare-pages": "2.9.0-pre.8",
+    "@remix-run/react": "2.9.0-pre.8",
     "isbot": "^4.1.0",
     "miniflare": "^3.20231030.4",
     "react": "^18.2.0",
diff --git a/packages/create-remix/CHANGELOG.md b/packages/create-remix/CHANGELOG.md
index d619a2fe299..7d30e49981a 100644
--- a/packages/create-remix/CHANGELOG.md
+++ b/packages/create-remix/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `create-remix`
 
+## 2.9.0-pre.8
+
 ## 2.9.0-pre.7
 
 ## 2.9.0-pre.6
diff --git a/packages/create-remix/package.json b/packages/create-remix/package.json
index e65d9b67988..0abea085005 100644
--- a/packages/create-remix/package.json
+++ b/packages/create-remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-remix",
-  "version": "2.9.0-pre.7",
+  "version": "2.9.0-pre.8",
   "description": "Create a new Remix app",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix-architect/CHANGELOG.md b/packages/remix-architect/CHANGELOG.md
index 7db2a0c88e6..88dd6e5b97b 100644
--- a/packages/remix-architect/CHANGELOG.md
+++ b/packages/remix-architect/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/architect`
 
+## 2.9.0-pre.8
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.8`
+
 ## 2.9.0-pre.7
 
 ### Patch Changes
diff --git a/packages/remix-architect/package.json b/packages/remix-architect/package.json
index 3f3187ea2f8..2ff5e5d341b 100644
--- a/packages/remix-architect/package.json
+++ b/packages/remix-architect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/architect",
-  "version": "2.9.0-pre.7",
+  "version": "2.9.0-pre.8",
   "description": "Architect server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare-pages/CHANGELOG.md b/packages/remix-cloudflare-pages/CHANGELOG.md
index fcbafadb786..e049f4a862b 100644
--- a/packages/remix-cloudflare-pages/CHANGELOG.md
+++ b/packages/remix-cloudflare-pages/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-pages`
 
+## 2.9.0-pre.8
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/cloudflare@2.9.0-pre.8`
+
 ## 2.9.0-pre.7
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare-pages/package.json b/packages/remix-cloudflare-pages/package.json
index 18f0b3eda81..bcf6ccc7b6d 100644
--- a/packages/remix-cloudflare-pages/package.json
+++ b/packages/remix-cloudflare-pages/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-pages",
-  "version": "2.9.0-pre.7",
+  "version": "2.9.0-pre.8",
   "description": "Cloudflare Pages request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare-workers/CHANGELOG.md b/packages/remix-cloudflare-workers/CHANGELOG.md
index 8fb61c62187..9bcde3d2c6f 100644
--- a/packages/remix-cloudflare-workers/CHANGELOG.md
+++ b/packages/remix-cloudflare-workers/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-workers`
 
+## 2.9.0-pre.8
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/cloudflare@2.9.0-pre.8`
+
 ## 2.9.0-pre.7
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare-workers/package.json b/packages/remix-cloudflare-workers/package.json
index 1ecbb27010f..0389266386e 100644
--- a/packages/remix-cloudflare-workers/package.json
+++ b/packages/remix-cloudflare-workers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-workers",
-  "version": "2.9.0-pre.7",
+  "version": "2.9.0-pre.8",
   "description": "Cloudflare worker request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare/CHANGELOG.md b/packages/remix-cloudflare/CHANGELOG.md
index f68bee99b19..84ef6b517ab 100644
--- a/packages/remix-cloudflare/CHANGELOG.md
+++ b/packages/remix-cloudflare/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare`
 
+## 2.9.0-pre.8
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.8`
+
 ## 2.9.0-pre.7
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare/package.json b/packages/remix-cloudflare/package.json
index a6af746d51e..b61c497ced3 100644
--- a/packages/remix-cloudflare/package.json
+++ b/packages/remix-cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare",
-  "version": "2.9.0-pre.7",
+  "version": "2.9.0-pre.8",
   "description": "Cloudflare platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-css-bundle/CHANGELOG.md b/packages/remix-css-bundle/CHANGELOG.md
index 819c573454c..fc4e74db2d7 100644
--- a/packages/remix-css-bundle/CHANGELOG.md
+++ b/packages/remix-css-bundle/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @remix-run/css-bundle
 
+## 2.9.0-pre.8
+
 ## 2.9.0-pre.7
 
 ## 2.9.0-pre.6
diff --git a/packages/remix-css-bundle/package.json b/packages/remix-css-bundle/package.json
index 9b090934752..3dcdd8e8157 100644
--- a/packages/remix-css-bundle/package.json
+++ b/packages/remix-css-bundle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/css-bundle",
-  "version": "2.9.0-pre.7",
+  "version": "2.9.0-pre.8",
   "description": "CSS bundle href when using CSS bundling features in Remix",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix-deno/CHANGELOG.md b/packages/remix-deno/CHANGELOG.md
index dd11cc3fcd2..c538cc1edda 100644
--- a/packages/remix-deno/CHANGELOG.md
+++ b/packages/remix-deno/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/deno`
 
+## 2.9.0-pre.8
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.8`
+
 ## 2.9.0-pre.7
 
 ### Patch Changes
diff --git a/packages/remix-deno/package.json b/packages/remix-deno/package.json
index f4974b6f7ea..33bf5c01d55 100644
--- a/packages/remix-deno/package.json
+++ b/packages/remix-deno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/deno",
-  "version": "2.9.0-pre.7",
+  "version": "2.9.0-pre.8",
   "description": "Deno platform abstractions for Remix",
   "homepage": "https://remix.run",
   "main": "./index.ts",
diff --git a/packages/remix-dev/CHANGELOG.md b/packages/remix-dev/CHANGELOG.md
index 9968187eb0e..56294965d9e 100644
--- a/packages/remix-dev/CHANGELOG.md
+++ b/packages/remix-dev/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/dev`
 
+## 2.9.0-pre.8
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.8`
+  - `@remix-run/server-runtime@2.9.0-pre.8`
+
 ## 2.9.0-pre.7
 
 ### Patch Changes
diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json
index 1c52f149de4..58f21dec1a0 100644
--- a/packages/remix-dev/package.json
+++ b/packages/remix-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/dev",
-  "version": "2.9.0-pre.7",
+  "version": "2.9.0-pre.8",
   "description": "Dev tools and CLI for Remix",
   "homepage": "https://remix.run",
   "bugs": {
@@ -106,8 +106,8 @@
     "wrangler": "^3.28.2"
   },
   "peerDependencies": {
-    "@remix-run/react": "^2.9.0-pre.7",
-    "@remix-run/serve": "^2.9.0-pre.7",
+    "@remix-run/react": "^2.9.0-pre.8",
+    "@remix-run/serve": "^2.9.0-pre.8",
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2"
diff --git a/packages/remix-eslint-config/CHANGELOG.md b/packages/remix-eslint-config/CHANGELOG.md
index 2554ade4052..c3e14cf2cc4 100644
--- a/packages/remix-eslint-config/CHANGELOG.md
+++ b/packages/remix-eslint-config/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `@remix-run/eslint-config`
 
+## 2.9.0-pre.8
+
 ## 2.9.0-pre.7
 
 ## 2.9.0-pre.6
diff --git a/packages/remix-eslint-config/package.json b/packages/remix-eslint-config/package.json
index 971c67ba091..0f3f2f04eb9 100644
--- a/packages/remix-eslint-config/package.json
+++ b/packages/remix-eslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/eslint-config",
-  "version": "2.9.0-pre.7",
+  "version": "2.9.0-pre.8",
   "description": "ESLint configuration for Remix projects",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-express/CHANGELOG.md b/packages/remix-express/CHANGELOG.md
index a1a391d89d6..0fbbedcd8c9 100644
--- a/packages/remix-express/CHANGELOG.md
+++ b/packages/remix-express/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/express`
 
+## 2.9.0-pre.8
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.0-pre.8`
+
 ## 2.9.0-pre.7
 
 ### Patch Changes
diff --git a/packages/remix-express/package.json b/packages/remix-express/package.json
index af95f6ac549..cf76846a91c 100644
--- a/packages/remix-express/package.json
+++ b/packages/remix-express/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/express",
-  "version": "2.9.0-pre.7",
+  "version": "2.9.0-pre.8",
   "description": "Express server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-node/CHANGELOG.md b/packages/remix-node/CHANGELOG.md
index b0b0febf63a..588ee3986f0 100644
--- a/packages/remix-node/CHANGELOG.md
+++ b/packages/remix-node/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/node`
 
+## 2.9.0-pre.8
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.8`
+
 ## 2.9.0-pre.7
 
 ### Patch Changes
diff --git a/packages/remix-node/package.json b/packages/remix-node/package.json
index 878c5c16333..30d5142ebf9 100644
--- a/packages/remix-node/package.json
+++ b/packages/remix-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/node",
-  "version": "2.9.0-pre.7",
+  "version": "2.9.0-pre.8",
   "description": "Node.js platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-react/CHANGELOG.md b/packages/remix-react/CHANGELOG.md
index 4fcd31d960b..721b5772a69 100644
--- a/packages/remix-react/CHANGELOG.md
+++ b/packages/remix-react/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/react`
 
+## 2.9.0-pre.8
+
+### Patch Changes
+
+- [REMOVE] bump router ([#9289](https://github.com/remix-run/remix/pull/9289))
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.0-pre.8`
+
 ## 2.9.0-pre.7
 
 ### Patch Changes
diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json
index a085270cc97..25ee4d3bd36 100644
--- a/packages/remix-react/package.json
+++ b/packages/remix-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/react",
-  "version": "2.9.0-pre.7",
+  "version": "2.9.0-pre.8",
   "description": "React DOM bindings for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-serve/CHANGELOG.md b/packages/remix-serve/CHANGELOG.md
index 96d3cd09954..593cc274ebd 100644
--- a/packages/remix-serve/CHANGELOG.md
+++ b/packages/remix-serve/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/serve`
 
+## 2.9.0-pre.8
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/express@2.9.0-pre.8`
+  - `@remix-run/node@2.9.0-pre.8`
+
 ## 2.9.0-pre.7
 
 ### Patch Changes
diff --git a/packages/remix-serve/package.json b/packages/remix-serve/package.json
index 4e1ccc4d265..711094ebb24 100644
--- a/packages/remix-serve/package.json
+++ b/packages/remix-serve/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/serve",
-  "version": "2.9.0-pre.7",
+  "version": "2.9.0-pre.8",
   "description": "Production application server for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-server-runtime/CHANGELOG.md b/packages/remix-server-runtime/CHANGELOG.md
index 386666f4e38..34f82eb9dcd 100644
--- a/packages/remix-server-runtime/CHANGELOG.md
+++ b/packages/remix-server-runtime/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `@remix-run/server-runtime`
 
+## 2.9.0-pre.8
+
 ## 2.9.0-pre.7
 
 ## 2.9.0-pre.6
diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json
index a10ca110b6d..28a6ae97d07 100644
--- a/packages/remix-server-runtime/package.json
+++ b/packages/remix-server-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/server-runtime",
-  "version": "2.9.0-pre.7",
+  "version": "2.9.0-pre.8",
   "description": "Server runtime for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-testing/CHANGELOG.md b/packages/remix-testing/CHANGELOG.md
index 8549d255683..e2c17541c27 100644
--- a/packages/remix-testing/CHANGELOG.md
+++ b/packages/remix-testing/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/testing`
 
+## 2.9.0-pre.8
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/react@2.9.0-pre.8`
+  - `@remix-run/node@2.9.0-pre.8`
+
 ## 2.9.0-pre.7
 
 ### Patch Changes
diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
index 5c354bc691c..76a253cd984 100644
--- a/packages/remix-testing/package.json
+++ b/packages/remix-testing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/testing",
-  "version": "2.9.0-pre.7",
+  "version": "2.9.0-pre.8",
   "description": "Testing utilities for Remix apps",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix/package.json b/packages/remix/package.json
index d4067c40896..32ee0d278ec 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "remix",
-  "version": "2.9.0-pre.7",
+  "version": "2.9.0-pre.8",
   "description": "A framework for building better websites",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1a3254eaff5..6093a43d010 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -548,13 +548,13 @@ importers:
   integration/helpers/vite-cloudflare-template:
     dependencies:
       '@remix-run/cloudflare':
-        specifier: 2.9.0-pre.7
+        specifier: 2.9.0-pre.8
         version: link:../../../packages/remix-cloudflare
       '@remix-run/cloudflare-pages':
-        specifier: 2.9.0-pre.7
+        specifier: 2.9.0-pre.8
         version: link:../../../packages/remix-cloudflare-pages
       '@remix-run/react':
-        specifier: 2.9.0-pre.7
+        specifier: 2.9.0-pre.8
         version: link:../../../packages/remix-react
       isbot:
         specifier: ^4.1.0
@@ -868,7 +868,7 @@ importers:
         specifier: workspace:*
         version: link:../remix-node
       '@remix-run/react':
-        specifier: ^2.9.0-pre.7
+        specifier: ^2.9.0-pre.8
         version: link:../remix-react
       '@remix-run/router':
         specifier: 1.16.0

From 46dd57bf0cbb76146c9fc7e571b1c6431329ec6a Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Tue, 23 Apr 2024 11:52:56 -0400
Subject: [PATCH 085/108] Exit prerelease mode

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

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

From bccd07773a24698ffa0116c12e8cc26561417d89 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 23 Apr 2024 12:46:50 -0400
Subject: [PATCH 086/108] chore: Update version for release (#9291)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Matt Brophy <matt@brophy.org>
---
 .changeset/brave-cars-approve.md              |  5 --
 .changeset/curvy-seahorses-jog.md             |  5 --
 .changeset/good-buses-divide.md               |  9 ---
 .changeset/heavy-steaks-remember.md           |  5 --
 .changeset/honest-geese-chew.md               |  5 --
 .changeset/nice-beds-sneeze.md                |  5 --
 .changeset/odd-frogs-attend.md                |  5 --
 .changeset/popular-adults-remain.md           |  5 --
 .changeset/pre.json                           | 49 ------------
 .changeset/response-stub.md                   | 25 -------
 .changeset/shiny-ravens-cross.md              |  5 --
 .changeset/shy-buttons-buy.md                 |  6 --
 .changeset/single-fetch-client-loaders.md     |  5 --
 .changeset/single-fetch-spa-mode.md           |  5 --
 .changeset/single-fetch.md                    | 15 ----
 .changeset/smooth-ways-march.md               |  5 --
 .changeset/spicy-ghosts-watch.md              |  5 --
 .changeset/update-docs.md                     |  5 --
 .changeset/violet-trains-change.md            |  5 --
 .changeset/young-eagles-grab.md               |  6 --
 CHANGELOG.md                                  | 15 ++--
 .../vite-cloudflare-template/package.json     |  6 +-
 packages/create-remix/CHANGELOG.md            | 18 +----
 packages/create-remix/package.json            |  2 +-
 packages/remix-architect/CHANGELOG.md         | 60 +--------------
 packages/remix-architect/package.json         |  2 +-
 packages/remix-cloudflare-pages/CHANGELOG.md  | 60 +--------------
 packages/remix-cloudflare-pages/package.json  |  2 +-
 .../remix-cloudflare-workers/CHANGELOG.md     | 60 +--------------
 .../remix-cloudflare-workers/package.json     |  2 +-
 packages/remix-cloudflare/CHANGELOG.md        | 60 +--------------
 packages/remix-cloudflare/package.json        |  2 +-
 packages/remix-css-bundle/CHANGELOG.md        | 18 +----
 packages/remix-css-bundle/package.json        |  2 +-
 packages/remix-deno/CHANGELOG.md              | 60 +--------------
 packages/remix-deno/package.json              |  2 +-
 packages/remix-dev/CHANGELOG.md               | 74 +-----------------
 packages/remix-dev/package.json               |  6 +-
 packages/remix-eslint-config/CHANGELOG.md     | 18 +----
 packages/remix-eslint-config/package.json     |  2 +-
 packages/remix-express/CHANGELOG.md           | 60 +--------------
 packages/remix-express/package.json           |  2 +-
 packages/remix-node/CHANGELOG.md              | 66 ++--------------
 packages/remix-node/package.json              |  2 +-
 packages/remix-react/CHANGELOG.md             | 71 ++----------------
 packages/remix-react/package.json             |  2 +-
 packages/remix-serve/CHANGELOG.md             | 75 ++-----------------
 packages/remix-serve/package.json             |  2 +-
 packages/remix-server-runtime/CHANGELOG.md    | 36 ++-------
 packages/remix-server-runtime/package.json    |  2 +-
 packages/remix-testing/CHANGELOG.md           | 70 +----------------
 packages/remix-testing/package.json           |  2 +-
 packages/remix/package.json                   |  2 +-
 pnpm-lock.yaml                                |  8 +-
 54 files changed, 79 insertions(+), 972 deletions(-)
 delete mode 100644 .changeset/brave-cars-approve.md
 delete mode 100644 .changeset/curvy-seahorses-jog.md
 delete mode 100644 .changeset/good-buses-divide.md
 delete mode 100644 .changeset/heavy-steaks-remember.md
 delete mode 100644 .changeset/honest-geese-chew.md
 delete mode 100644 .changeset/nice-beds-sneeze.md
 delete mode 100644 .changeset/odd-frogs-attend.md
 delete mode 100644 .changeset/popular-adults-remain.md
 delete mode 100644 .changeset/pre.json
 delete mode 100644 .changeset/response-stub.md
 delete mode 100644 .changeset/shiny-ravens-cross.md
 delete mode 100644 .changeset/shy-buttons-buy.md
 delete mode 100644 .changeset/single-fetch-client-loaders.md
 delete mode 100644 .changeset/single-fetch-spa-mode.md
 delete mode 100644 .changeset/single-fetch.md
 delete mode 100644 .changeset/smooth-ways-march.md
 delete mode 100644 .changeset/spicy-ghosts-watch.md
 delete mode 100644 .changeset/update-docs.md
 delete mode 100644 .changeset/violet-trains-change.md
 delete mode 100644 .changeset/young-eagles-grab.md

diff --git a/.changeset/brave-cars-approve.md b/.changeset/brave-cars-approve.md
deleted file mode 100644
index a8c3700ef6d..00000000000
--- a/.changeset/brave-cars-approve.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@remix-run/node": minor
----
-
-Use undici as our fetch polyfill going forward. #9106
diff --git a/.changeset/curvy-seahorses-jog.md b/.changeset/curvy-seahorses-jog.md
deleted file mode 100644
index 7365d23875f..00000000000
--- a/.changeset/curvy-seahorses-jog.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"create-remix": patch
----
-
-Allow `.` in repo name when using `--template` flag
diff --git a/.changeset/good-buses-divide.md b/.changeset/good-buses-divide.md
deleted file mode 100644
index 913eb1bc877..00000000000
--- a/.changeset/good-buses-divide.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-"@remix-run/node": patch
-"@remix-run/serve": patch
----
-
-- Put `undici` fetch polyfill behind a new `installGlobals({ nativeFetch: true })` parameter
-- `remix-serve` will default to using `undici` for the fetch polyfill if `future._unstable_singleFetch` is enabled because the single fetch implementation relies on the `undici` polyfill
-  - Any users opting into Single Fetch and managing their own polfill will need to pass the flag to `installGlobals` on their own to avoid runtime errors with Single Fetch
-
diff --git a/.changeset/heavy-steaks-remember.md b/.changeset/heavy-steaks-remember.md
deleted file mode 100644
index 0d6f7316d9a..00000000000
--- a/.changeset/heavy-steaks-remember.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@remix-run/dev": patch
----
-
-Improve `getDependenciesToBundle` resolution in monorepos
diff --git a/.changeset/honest-geese-chew.md b/.changeset/honest-geese-chew.md
deleted file mode 100644
index ea802b30d9d..00000000000
--- a/.changeset/honest-geese-chew.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@remix-run/react": patch
----
-
-[REMOVE] Loosen header check on turbo stream responses for SSG compatibility
diff --git a/.changeset/nice-beds-sneeze.md b/.changeset/nice-beds-sneeze.md
deleted file mode 100644
index f7970bae072..00000000000
--- a/.changeset/nice-beds-sneeze.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@remix-run/server-runtime": patch
----
-
-[REMOVE] Fix typings for response in LoaderFunctonArgs/ActionFunctionArgs
diff --git a/.changeset/odd-frogs-attend.md b/.changeset/odd-frogs-attend.md
deleted file mode 100644
index 18907021cc2..00000000000
--- a/.changeset/odd-frogs-attend.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@remix-run/server-runtime": patch
----
-
-handle net new redirects created by handleDataRequest
diff --git a/.changeset/popular-adults-remain.md b/.changeset/popular-adults-remain.md
deleted file mode 100644
index 939fe3a81ef..00000000000
--- a/.changeset/popular-adults-remain.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@remix-run/server-runtime": patch
----
-
-[REMOVE] Remove RR flags and implement via dataStrategy
diff --git a/.changeset/pre.json b/.changeset/pre.json
deleted file mode 100644
index 34d5e457f2e..00000000000
--- a/.changeset/pre.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "mode": "exit",
-  "tag": "pre",
-  "initialVersions": {
-    "integration": "0.0.0",
-    "integration-cf-template": "0.0.0",
-    "integration-deno-template": "0.0.0",
-    "integration-node-template": "0.0.0",
-    "integration-vite-cloudflare-template": "0.0.0",
-    "integration-vite-template": "0.0.0",
-    "create-remix": "2.8.1",
-    "remix": "2.8.1",
-    "@remix-run/architect": "2.8.1",
-    "@remix-run/cloudflare": "2.8.1",
-    "@remix-run/cloudflare-pages": "2.8.1",
-    "@remix-run/cloudflare-workers": "2.8.1",
-    "@remix-run/css-bundle": "2.8.1",
-    "@remix-run/deno": "2.8.1",
-    "@remix-run/dev": "2.8.1",
-    "@remix-run/eslint-config": "2.8.1",
-    "@remix-run/express": "2.8.1",
-    "@remix-run/node": "2.8.1",
-    "@remix-run/react": "2.8.1",
-    "@remix-run/serve": "2.8.1",
-    "@remix-run/server-runtime": "2.8.1",
-    "@remix-run/testing": "2.8.1"
-  },
-  "changesets": [
-    "brave-cars-approve",
-    "curvy-seahorses-jog",
-    "good-buses-divide",
-    "heavy-steaks-remember",
-    "honest-geese-chew",
-    "nice-beds-sneeze",
-    "odd-frogs-attend",
-    "popular-adults-remain",
-    "response-stub",
-    "shiny-ravens-cross",
-    "shy-buttons-buy",
-    "single-fetch-client-loaders",
-    "single-fetch-spa-mode",
-    "single-fetch",
-    "smooth-ways-march",
-    "spicy-ghosts-watch",
-    "update-docs",
-    "violet-trains-change",
-    "young-eagles-grab"
-  ]
-}
diff --git a/.changeset/response-stub.md b/.changeset/response-stub.md
deleted file mode 100644
index cef4c45e9a7..00000000000
--- a/.changeset/response-stub.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-"@remix-run/server-runtime": patch
----
-
-Add `ResponseStub` header interface for single fetch and deprecate the `headers` export
-
-- The `headers` export is no longer used when single fetch is enabled
-- `loader`/`action` functions now receive a mutable `response` parameter
-  - `type ResponseStub = { status: numbers | undefined, headers: Headers }`
-- To alter the status of a response, set the `status` field directly
-  - `response.status = 201`
-- To set headers on the Response, you may use:
-  - `response.headers.set`
-  - `response.headers.append`
-  - `response.headers.delete`
-- Each `loader`/`action`receives it's own unique `response` instance so you cannot see what other `loader`/`action` functions have set (which would be subject to race conditions)
-- If all status codes are unset or have values <200, the deepest status code will be used for the HTTP response
-- If any status codes are set to a value >=300, the highest >=300 value will be used for the HTTP Response
-- Remix tracks header operations and will replay them in order (action if present, then loaders top-down) after all handlers have completed on a fresh `Headers` instance that will be applied to the HTTP Response
-  - `headers.set` on any child handler will overwrite values from parent handlers
-  - `headers.append` can be used to set the same header from both a parent and child handler
-  - `headers.delete` can be used to delete a value set by a parent handler, but not a value set from a child handler
-- Because single fetch supports naked object returns, and you no longer need to return a `Response` instance to set status/headers, the `json`/`redirect`/`redirectDocument`/`defer` utilities are considered deprecated when using Single Fetch
-- You may still continue returning normal `Response` instances and they'll apply status codes in the same way, and will apply all headers via `headers.set` - overwriting any same-named header values from parents
-  - If you need to append, you will need to switch from returning a `Response` instance to using the new `response` parameter
diff --git a/.changeset/shiny-ravens-cross.md b/.changeset/shiny-ravens-cross.md
deleted file mode 100644
index a1eccc4f5ef..00000000000
--- a/.changeset/shiny-ravens-cross.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@remix-run/react": patch
----
-
-[REMOVE] bump router
diff --git a/.changeset/shy-buttons-buy.md b/.changeset/shy-buttons-buy.md
deleted file mode 100644
index 5ef85720043..00000000000
--- a/.changeset/shy-buttons-buy.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"remix": patch
-"@remix-run/react": patch
----
-
-fix: escape single fetch transfer
diff --git a/.changeset/single-fetch-client-loaders.md b/.changeset/single-fetch-client-loaders.md
deleted file mode 100644
index a4933ed4f5d..00000000000
--- a/.changeset/single-fetch-client-loaders.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@remix-run/react": patch
----
-
-Update single fetch implementation to avoid over-fetching when clientLoader's exist
diff --git a/.changeset/single-fetch-spa-mode.md b/.changeset/single-fetch-spa-mode.md
deleted file mode 100644
index 1cab92c1147..00000000000
--- a/.changeset/single-fetch-spa-mode.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@remix-run/dev": patch
----
-
-Fix SPA mode when single fetch is enabled by using streaming entry.server
diff --git a/.changeset/single-fetch.md b/.changeset/single-fetch.md
deleted file mode 100644
index 3e7a38c3069..00000000000
--- a/.changeset/single-fetch.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-"@remix-run/dev": minor
-"@remix-run/react": minor
-"@remix-run/server-runtime": minor
-"@remix-run/testing": minor
----
-
-New `future.unstable_singleFetch` flag
-
-- Naked objects returned from loaders/actions are no longer automatically converted to JSON responses. They'll be streamed as-is via `turbo-stream` so `Date`'s will become `Date` through `useLoaderData()`
-- You can return naked objects with `Promise`'s without needing to use `defer()` - including nested `Promise`'s
-  - If you need to return a custom status code or custom response headers, you can still use the `defer` utility
-- `<RemixServer abortDelay>` is no longer used. Instead, you should `export const streamTimeout` from `entry.server.tsx` and the remix server runtime will use that as the delay to abort the streamed response
-  - If you export your own streamTimeout, you should decouple that from aborting the react `renderToPipeableStream`. You should always ensure that react is aborted _afer_ the stream is aborted so that abort rejections can be flushed down
-- Actions no longer automatically revalidate on 4xx/5xx responses (via RR `future.unstable_skipActionErrorRevalidation` flag) - you can return a 2xx to opt-into revalidation or use `shouldRevalidate`
diff --git a/.changeset/smooth-ways-march.md b/.changeset/smooth-ways-march.md
deleted file mode 100644
index b85c4e22a05..00000000000
--- a/.changeset/smooth-ways-march.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@remix-run/react": patch
----
-
-[REMOVE] Include future folder in published package
diff --git a/.changeset/spicy-ghosts-watch.md b/.changeset/spicy-ghosts-watch.md
deleted file mode 100644
index 8aca8ce40b0..00000000000
--- a/.changeset/spicy-ghosts-watch.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@remix-run/dev": patch
----
-
-Vite: added sourcemap support for transformed routes
diff --git a/.changeset/update-docs.md b/.changeset/update-docs.md
deleted file mode 100644
index 4f329c4b8cf..00000000000
--- a/.changeset/update-docs.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@remix-run/dev": patch
----
-
-Update links printed to the console by the Remix CLI/Dev Server to point to updated docs locations
diff --git a/.changeset/violet-trains-change.md b/.changeset/violet-trains-change.md
deleted file mode 100644
index 8cf0043b213..00000000000
--- a/.changeset/violet-trains-change.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@remix-run/react": patch
----
-
-[REMOVE] Fix return type when no promise is used
diff --git a/.changeset/young-eagles-grab.md b/.changeset/young-eagles-grab.md
deleted file mode 100644
index 784b5b7c859..00000000000
--- a/.changeset/young-eagles-grab.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@remix-run/react": patch
----
-
-Opt-in types for single-fetch
-- To opt-in to type inference for single-fetch, add `./node_modules/@remix-run/react/future/single-fetch.d.ts` to `include` in your `tsconfig.json`
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a19d06cb3fd..69b4bb5346f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -169,7 +169,7 @@ Date: YYYY-MM-DD
 
 ## v2.9.0
 
-Date: 2024-04-03
+Date: 2024-04-23
 
 ### What's Changed
 
@@ -179,6 +179,7 @@ Date: 2024-04-03
 
 - Naked objects returned from `loader`/`action` functions are no longer automatically serialized to JSON responses
   - Instead, they'll be streamed as-is via [`turbo-stream`](https://github.com/jacob-ebey/turbo-stream) which allows direct serialization of more complex types such as `Promise`, `Date`, `Map` instances, and more
+  - You will need to modify your `tsconfig.json`'s `include` array to infer types properly when using Single Fetch
 - The `headers` export is no longer used when Single Fetch is enabled in favor of a new `response` stub passed to your `loader`/`action` functions
 - The `json`/`defer`/`redirect` utilities are deprecated when using Single Fetch (but still work _mostly_ the same)
 - Actions no longer automatically revalidate on `4xx`/`5xx` responses - you can return a `2xx` to opt-into revalidation or use `shouldRevalidate`
@@ -201,18 +202,18 @@ Remix `2.9.0` adds a new `installGlobals({ nativeFetch: true })` flag to opt int
 
 ### Minor Changes
 
-- New `future.unstable_singleFetch` flag ([#8773](https://github.com/remix-run/remix/pull/8773), [#9073](https://github.com/remix-run/remix/pull/9073), [#9084](https://github.com/remix-run/remix/pull/9084))
-- `@remix-run/dev` - Improve `getDependenciesToBundle` resolution in monorepos ([#8848](https://github.com/remix-run/remix/pull/8848))
-- `@remix-run/dev` - Fix SPA mode when Single Fetch is enabled by using streaming `entry.server` ([#9063](https://github.com/remix-run/remix/pull/9063))
-- `@remix-run/dev` - Vite: added sourcemap support for transformed routes ([#8970](https://github.com/remix-run/remix/pull/8970))
+- New `future.unstable_singleFetch` flag ([#8773](https://github.com/remix-run/remix/pull/8773), [#9073](https://github.com/remix-run/remix/pull/9073), [#9084](https://github.com/remix-run/remix/pull/9084), [#9272](https://github.com/remix-run/remix/pull/9272))
 - `@remix-run/node` - Add a new `installGlobals({ nativeFetch: true })` flag to opt-into using [`undici`](https://github.com/nodejs/undici) as the fetch polyfill instead of `@remix-run/web-*` ([#9106](https://github.com/remix-run/remix/pull/9106), [#9111](https://github.com/remix-run/remix/pull/9111), [#9198](https://github.com/remix-run/remix/pull/9198))
-- `@remix-run/server-runtime` - Add `ResponseStub` header interface for Single Fetch and deprecate the `headers` export ([#9142](https://github.com/remix-run/remix/pull/9142))
-- `@remix-run/server-runtime` - Handle redirects created by `handleDataRequest` ([#9104](https://github.com/remix-run/remix/pull/9104))
+- `@remix-run/server-runtime` - Add `ResponseStub` header interface and deprecate the `headers` export when Single Fetch is enabled ([#9142](https://github.com/remix-run/remix/pull/9142))
 
 ### Patch Changes
 
 - `create-remix` - Allow `.` in repo name when using `--template` flag ([#9026](https://github.com/remix-run/remix/pull/9026))
+- `@remix-run/dev` - Improve `getDependenciesToBundle` resolution in monorepos ([#8848](https://github.com/remix-run/remix/pull/8848))
+- `@remix-run/dev` - Fix SPA mode when Single Fetch is enabled by using streaming `entry.server` ([#9063](https://github.com/remix-run/remix/pull/9063))
+- `@remix-run/dev` - Vite: added sourcemap support for transformed routes ([#8970](https://github.com/remix-run/remix/pull/8970))
 - `@remix-run/dev` - Update links printed to the console by the Remix CLI/Dev Server to point to updated docs locations ([#9176](https://github.com/remix-run/remix/pull/9176))
+- `@remix-run/server-runtime` - Handle redirects created by `handleDataRequest` ([#9104](https://github.com/remix-run/remix/pull/9104))
 
 ### Updated Dependencies
 
diff --git a/integration/helpers/vite-cloudflare-template/package.json b/integration/helpers/vite-cloudflare-template/package.json
index 2a25b31f493..e0d8e439bd5 100644
--- a/integration/helpers/vite-cloudflare-template/package.json
+++ b/integration/helpers/vite-cloudflare-template/package.json
@@ -11,9 +11,9 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/cloudflare": "2.9.0-pre.8",
-    "@remix-run/cloudflare-pages": "2.9.0-pre.8",
-    "@remix-run/react": "2.9.0-pre.8",
+    "@remix-run/cloudflare": "2.9.0",
+    "@remix-run/cloudflare-pages": "2.9.0",
+    "@remix-run/react": "2.9.0",
     "isbot": "^4.1.0",
     "miniflare": "^3.20231030.4",
     "react": "^18.2.0",
diff --git a/packages/create-remix/CHANGELOG.md b/packages/create-remix/CHANGELOG.md
index 7d30e49981a..cbbaa818e27 100644
--- a/packages/create-remix/CHANGELOG.md
+++ b/packages/create-remix/CHANGELOG.md
@@ -1,22 +1,6 @@
 # `create-remix`
 
-## 2.9.0-pre.8
-
-## 2.9.0-pre.7
-
-## 2.9.0-pre.6
-
-## 2.9.0-pre.5
-
-## 2.9.0-pre.4
-
-## 2.9.0-pre.3
-
-## 2.9.0-pre.2
-
-## 2.9.0-pre.1
-
-## 2.9.0-pre.0
+## 2.9.0
 
 ### Patch Changes
 
diff --git a/packages/create-remix/package.json b/packages/create-remix/package.json
index 0abea085005..b2a572af9d9 100644
--- a/packages/create-remix/package.json
+++ b/packages/create-remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-remix",
-  "version": "2.9.0-pre.8",
+  "version": "2.9.0",
   "description": "Create a new Remix app",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix-architect/CHANGELOG.md b/packages/remix-architect/CHANGELOG.md
index 88dd6e5b97b..a339ea71e23 100644
--- a/packages/remix-architect/CHANGELOG.md
+++ b/packages/remix-architect/CHANGELOG.md
@@ -1,67 +1,11 @@
 # `@remix-run/architect`
 
-## 2.9.0-pre.8
+## 2.9.0
 
 ### Patch Changes
 
 - Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.8`
-
-## 2.9.0-pre.7
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.7`
-
-## 2.9.0-pre.6
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.6`
-
-## 2.9.0-pre.5
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.5`
-
-## 2.9.0-pre.4
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.4`
-
-## 2.9.0-pre.3
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.3`
-
-## 2.9.0-pre.2
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.2`
-
-## 2.9.0-pre.1
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.1`
-
-## 2.9.0-pre.0
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.0`
+  - `@remix-run/node@2.9.0`
 
 ## 2.8.1
 
diff --git a/packages/remix-architect/package.json b/packages/remix-architect/package.json
index 2ff5e5d341b..d337c3d5092 100644
--- a/packages/remix-architect/package.json
+++ b/packages/remix-architect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/architect",
-  "version": "2.9.0-pre.8",
+  "version": "2.9.0",
   "description": "Architect server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare-pages/CHANGELOG.md b/packages/remix-cloudflare-pages/CHANGELOG.md
index e049f4a862b..d5b226d44d7 100644
--- a/packages/remix-cloudflare-pages/CHANGELOG.md
+++ b/packages/remix-cloudflare-pages/CHANGELOG.md
@@ -1,67 +1,11 @@
 # `@remix-run/cloudflare-pages`
 
-## 2.9.0-pre.8
+## 2.9.0
 
 ### Patch Changes
 
 - Updated dependencies:
-  - `@remix-run/cloudflare@2.9.0-pre.8`
-
-## 2.9.0-pre.7
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/cloudflare@2.9.0-pre.7`
-
-## 2.9.0-pre.6
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/cloudflare@2.9.0-pre.6`
-
-## 2.9.0-pre.5
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/cloudflare@2.9.0-pre.5`
-
-## 2.9.0-pre.4
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/cloudflare@2.9.0-pre.4`
-
-## 2.9.0-pre.3
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/cloudflare@2.9.0-pre.3`
-
-## 2.9.0-pre.2
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/cloudflare@2.9.0-pre.2`
-
-## 2.9.0-pre.1
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/cloudflare@2.9.0-pre.1`
-
-## 2.9.0-pre.0
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/cloudflare@2.9.0-pre.0`
+  - `@remix-run/cloudflare@2.9.0`
 
 ## 2.8.1
 
diff --git a/packages/remix-cloudflare-pages/package.json b/packages/remix-cloudflare-pages/package.json
index bcf6ccc7b6d..2d1772220fb 100644
--- a/packages/remix-cloudflare-pages/package.json
+++ b/packages/remix-cloudflare-pages/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-pages",
-  "version": "2.9.0-pre.8",
+  "version": "2.9.0",
   "description": "Cloudflare Pages request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare-workers/CHANGELOG.md b/packages/remix-cloudflare-workers/CHANGELOG.md
index 9bcde3d2c6f..808f1a4097c 100644
--- a/packages/remix-cloudflare-workers/CHANGELOG.md
+++ b/packages/remix-cloudflare-workers/CHANGELOG.md
@@ -1,67 +1,11 @@
 # `@remix-run/cloudflare-workers`
 
-## 2.9.0-pre.8
+## 2.9.0
 
 ### Patch Changes
 
 - Updated dependencies:
-  - `@remix-run/cloudflare@2.9.0-pre.8`
-
-## 2.9.0-pre.7
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/cloudflare@2.9.0-pre.7`
-
-## 2.9.0-pre.6
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/cloudflare@2.9.0-pre.6`
-
-## 2.9.0-pre.5
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/cloudflare@2.9.0-pre.5`
-
-## 2.9.0-pre.4
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/cloudflare@2.9.0-pre.4`
-
-## 2.9.0-pre.3
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/cloudflare@2.9.0-pre.3`
-
-## 2.9.0-pre.2
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/cloudflare@2.9.0-pre.2`
-
-## 2.9.0-pre.1
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/cloudflare@2.9.0-pre.1`
-
-## 2.9.0-pre.0
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/cloudflare@2.9.0-pre.0`
+  - `@remix-run/cloudflare@2.9.0`
 
 ## 2.8.1
 
diff --git a/packages/remix-cloudflare-workers/package.json b/packages/remix-cloudflare-workers/package.json
index 0389266386e..2eef3021b3e 100644
--- a/packages/remix-cloudflare-workers/package.json
+++ b/packages/remix-cloudflare-workers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-workers",
-  "version": "2.9.0-pre.8",
+  "version": "2.9.0",
   "description": "Cloudflare worker request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare/CHANGELOG.md b/packages/remix-cloudflare/CHANGELOG.md
index 84ef6b517ab..29e78b3e87f 100644
--- a/packages/remix-cloudflare/CHANGELOG.md
+++ b/packages/remix-cloudflare/CHANGELOG.md
@@ -1,67 +1,11 @@
 # `@remix-run/cloudflare`
 
-## 2.9.0-pre.8
+## 2.9.0
 
 ### Patch Changes
 
 - Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.8`
-
-## 2.9.0-pre.7
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.7`
-
-## 2.9.0-pre.6
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.6`
-
-## 2.9.0-pre.5
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.5`
-
-## 2.9.0-pre.4
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.4`
-
-## 2.9.0-pre.3
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.3`
-
-## 2.9.0-pre.2
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.2`
-
-## 2.9.0-pre.1
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.1`
-
-## 2.9.0-pre.0
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.0`
+  - `@remix-run/server-runtime@2.9.0`
 
 ## 2.8.1
 
diff --git a/packages/remix-cloudflare/package.json b/packages/remix-cloudflare/package.json
index b61c497ced3..b6d37143456 100644
--- a/packages/remix-cloudflare/package.json
+++ b/packages/remix-cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare",
-  "version": "2.9.0-pre.8",
+  "version": "2.9.0",
   "description": "Cloudflare platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-css-bundle/CHANGELOG.md b/packages/remix-css-bundle/CHANGELOG.md
index fc4e74db2d7..a4e38d1ee84 100644
--- a/packages/remix-css-bundle/CHANGELOG.md
+++ b/packages/remix-css-bundle/CHANGELOG.md
@@ -1,22 +1,8 @@
 # @remix-run/css-bundle
 
-## 2.9.0-pre.8
+## 2.9.0
 
-## 2.9.0-pre.7
-
-## 2.9.0-pre.6
-
-## 2.9.0-pre.5
-
-## 2.9.0-pre.4
-
-## 2.9.0-pre.3
-
-## 2.9.0-pre.2
-
-## 2.9.0-pre.1
-
-## 2.9.0-pre.0
+No significant changes to this package were made in this release. [See the repo `CHANGELOG.md`](https://github.com/remix-run/remix/blob/main/CHANGELOG.md) for an overview of all changes in v2.9.0.
 
 ## 2.8.1
 
diff --git a/packages/remix-css-bundle/package.json b/packages/remix-css-bundle/package.json
index 3dcdd8e8157..2d938571cf1 100644
--- a/packages/remix-css-bundle/package.json
+++ b/packages/remix-css-bundle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/css-bundle",
-  "version": "2.9.0-pre.8",
+  "version": "2.9.0",
   "description": "CSS bundle href when using CSS bundling features in Remix",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix-deno/CHANGELOG.md b/packages/remix-deno/CHANGELOG.md
index c538cc1edda..bb0dd2e3962 100644
--- a/packages/remix-deno/CHANGELOG.md
+++ b/packages/remix-deno/CHANGELOG.md
@@ -1,67 +1,11 @@
 # `@remix-run/deno`
 
-## 2.9.0-pre.8
+## 2.9.0
 
 ### Patch Changes
 
 - Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.8`
-
-## 2.9.0-pre.7
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.7`
-
-## 2.9.0-pre.6
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.6`
-
-## 2.9.0-pre.5
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.5`
-
-## 2.9.0-pre.4
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.4`
-
-## 2.9.0-pre.3
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.3`
-
-## 2.9.0-pre.2
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.2`
-
-## 2.9.0-pre.1
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.1`
-
-## 2.9.0-pre.0
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.0`
+  - `@remix-run/server-runtime@2.9.0`
 
 ## 2.8.1
 
diff --git a/packages/remix-deno/package.json b/packages/remix-deno/package.json
index 33bf5c01d55..b63dbf9b0f2 100644
--- a/packages/remix-deno/package.json
+++ b/packages/remix-deno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/deno",
-  "version": "2.9.0-pre.8",
+  "version": "2.9.0",
   "description": "Deno platform abstractions for Remix",
   "homepage": "https://remix.run",
   "main": "./index.ts",
diff --git a/packages/remix-dev/CHANGELOG.md b/packages/remix-dev/CHANGELOG.md
index 56294965d9e..527d7f844e9 100644
--- a/packages/remix-dev/CHANGELOG.md
+++ b/packages/remix-dev/CHANGELOG.md
@@ -1,71 +1,6 @@
 # `@remix-run/dev`
 
-## 2.9.0-pre.8
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.8`
-  - `@remix-run/server-runtime@2.9.0-pre.8`
-
-## 2.9.0-pre.7
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.7`
-  - `@remix-run/server-runtime@2.9.0-pre.7`
-
-## 2.9.0-pre.6
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.6`
-  - `@remix-run/server-runtime@2.9.0-pre.6`
-
-## 2.9.0-pre.5
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.5`
-  - `@remix-run/server-runtime@2.9.0-pre.5`
-
-## 2.9.0-pre.4
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.4`
-  - `@remix-run/node@2.9.0-pre.4`
-
-## 2.9.0-pre.3
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.3`
-  - `@remix-run/server-runtime@2.9.0-pre.3`
-
-## 2.9.0-pre.2
-
-### Patch Changes
-
-- Update links printed to the console by the Remix CLI/Dev Server to point to updated docs locations ([#9176](https://github.com/remix-run/remix/pull/9176))
-- Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.2`
-  - `@remix-run/server-runtime@2.9.0-pre.2`
-
-## 2.9.0-pre.1
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.1`
-  - `@remix-run/node@2.9.0-pre.1`
-
-## 2.9.0-pre.0
+## 2.9.0
 
 ### Minor Changes
 
@@ -83,11 +18,10 @@
 - Improve `getDependenciesToBundle` resolution in monorepos ([#8848](https://github.com/remix-run/remix/pull/8848))
 - Fix SPA mode when single fetch is enabled by using streaming entry.server ([#9063](https://github.com/remix-run/remix/pull/9063))
 - Vite: added sourcemap support for transformed routes ([#8970](https://github.com/remix-run/remix/pull/8970))
+- Update links printed to the console by the Remix CLI/Dev Server to point to updated docs locations ([#9176](https://github.com/remix-run/remix/pull/9176))
 - Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.0`
-  - `@remix-run/server-runtime@2.9.0-pre.0`
-  - `@remix-run/react@2.9.0-pre.0`
-  - `@remix-run/serve@2.9.0-pre.0`
+  - `@remix-run/node@2.9.0`
+  - `@remix-run/server-runtime@2.9.0`
 
 ## 2.8.1
 
diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json
index 58f21dec1a0..7fdea096978 100644
--- a/packages/remix-dev/package.json
+++ b/packages/remix-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/dev",
-  "version": "2.9.0-pre.8",
+  "version": "2.9.0",
   "description": "Dev tools and CLI for Remix",
   "homepage": "https://remix.run",
   "bugs": {
@@ -106,8 +106,8 @@
     "wrangler": "^3.28.2"
   },
   "peerDependencies": {
-    "@remix-run/react": "^2.9.0-pre.8",
-    "@remix-run/serve": "^2.9.0-pre.8",
+    "@remix-run/react": "^2.9.0",
+    "@remix-run/serve": "^2.9.0",
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2"
diff --git a/packages/remix-eslint-config/CHANGELOG.md b/packages/remix-eslint-config/CHANGELOG.md
index c3e14cf2cc4..7698a29751e 100644
--- a/packages/remix-eslint-config/CHANGELOG.md
+++ b/packages/remix-eslint-config/CHANGELOG.md
@@ -1,22 +1,8 @@
 # `@remix-run/eslint-config`
 
-## 2.9.0-pre.8
+## 2.9.0
 
-## 2.9.0-pre.7
-
-## 2.9.0-pre.6
-
-## 2.9.0-pre.5
-
-## 2.9.0-pre.4
-
-## 2.9.0-pre.3
-
-## 2.9.0-pre.2
-
-## 2.9.0-pre.1
-
-## 2.9.0-pre.0
+No significant changes to this package were made in this release. [See the repo `CHANGELOG.md`](https://github.com/remix-run/remix/blob/main/CHANGELOG.md) for an overview of all changes in v2.9.0.
 
 ## 2.8.1
 
diff --git a/packages/remix-eslint-config/package.json b/packages/remix-eslint-config/package.json
index 0f3f2f04eb9..e2a9a8acb20 100644
--- a/packages/remix-eslint-config/package.json
+++ b/packages/remix-eslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/eslint-config",
-  "version": "2.9.0-pre.8",
+  "version": "2.9.0",
   "description": "ESLint configuration for Remix projects",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-express/CHANGELOG.md b/packages/remix-express/CHANGELOG.md
index 0fbbedcd8c9..241eec25029 100644
--- a/packages/remix-express/CHANGELOG.md
+++ b/packages/remix-express/CHANGELOG.md
@@ -1,67 +1,11 @@
 # `@remix-run/express`
 
-## 2.9.0-pre.8
+## 2.9.0
 
 ### Patch Changes
 
 - Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.8`
-
-## 2.9.0-pre.7
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.7`
-
-## 2.9.0-pre.6
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.6`
-
-## 2.9.0-pre.5
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.5`
-
-## 2.9.0-pre.4
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.4`
-
-## 2.9.0-pre.3
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.3`
-
-## 2.9.0-pre.2
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.2`
-
-## 2.9.0-pre.1
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.1`
-
-## 2.9.0-pre.0
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.0`
+  - `@remix-run/node@2.9.0`
 
 ## 2.8.1
 
diff --git a/packages/remix-express/package.json b/packages/remix-express/package.json
index cf76846a91c..7571b65e244 100644
--- a/packages/remix-express/package.json
+++ b/packages/remix-express/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/express",
-  "version": "2.9.0-pre.8",
+  "version": "2.9.0",
   "description": "Express server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-node/CHANGELOG.md b/packages/remix-node/CHANGELOG.md
index 588ee3986f0..7bad0a52712 100644
--- a/packages/remix-node/CHANGELOG.md
+++ b/packages/remix-node/CHANGELOG.md
@@ -1,74 +1,18 @@
 # `@remix-run/node`
 
-## 2.9.0-pre.8
+## 2.9.0
 
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.8`
-
-## 2.9.0-pre.7
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.7`
-
-## 2.9.0-pre.6
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.6`
-
-## 2.9.0-pre.5
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.5`
-
-## 2.9.0-pre.4
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.4`
-
-## 2.9.0-pre.3
-
-### Patch Changes
+### Minor Changes
 
-- - Put `undici` fetch polyfill behind a new `installGlobals({ nativeFetch: true })` parameter ([#9198](https://github.com/remix-run/remix/pull/9198))
+- Use undici as our fetch polyfill going forward ([#9106](https://github.com/remix-run/remix/pull/9106), [#9111](https://github.com/remix-run/remix/pull/9111))
+- Put `undici` fetch polyfill behind a new `installGlobals({ nativeFetch: true })` parameter ([#9198](https://github.com/remix-run/remix/pull/9198))
   - `remix-serve` will default to using `undici` for the fetch polyfill if `future._unstable_singleFetch` is enabled because the single fetch implementation relies on the `undici` polyfill
     - Any users opting into Single Fetch and managing their own polfill will need to pass the flag to `installGlobals` on their own to avoid runtime errors with Single Fetch
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.3`
-
-## 2.9.0-pre.2
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.2`
-
-## 2.9.0-pre.1
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.1`
-
-## 2.9.0-pre.0
-
-### Minor Changes
-
-- Use undici as our fetch polyfill going forward. #9106 ([#9111](https://github.com/remix-run/remix/pull/9111))
 
 ### Patch Changes
 
 - Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.0`
+  - `@remix-run/server-runtime@2.9.0`
 
 ## 2.8.1
 
diff --git a/packages/remix-node/package.json b/packages/remix-node/package.json
index 30d5142ebf9..88b5fd1c57b 100644
--- a/packages/remix-node/package.json
+++ b/packages/remix-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/node",
-  "version": "2.9.0-pre.8",
+  "version": "2.9.0",
   "description": "Node.js platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-react/CHANGELOG.md b/packages/remix-react/CHANGELOG.md
index 721b5772a69..dda3ef5fd67 100644
--- a/packages/remix-react/CHANGELOG.md
+++ b/packages/remix-react/CHANGELOG.md
@@ -1,68 +1,6 @@
 # `@remix-run/react`
 
-## 2.9.0-pre.8
-
-### Patch Changes
-
-- [REMOVE] bump router ([#9289](https://github.com/remix-run/remix/pull/9289))
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.8`
-
-## 2.9.0-pre.7
-
-### Patch Changes
-
-- [REMOVE] Fix return type when no promise is used ([`194788b93`](https://github.com/remix-run/remix/commit/194788b930e2e627200349af19ca818146151244))
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.7`
-
-## 2.9.0-pre.6
-
-### Patch Changes
-
-- [REMOVE] Include future folder in published package ([#9282](https://github.com/remix-run/remix/pull/9282))
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.6`
-
-## 2.9.0-pre.5
-
-### Patch Changes
-
-- Opt-in types for single-fetch ([#9272](https://github.com/remix-run/remix/pull/9272))
-  - To opt-in to type inference for single-fetch, add `./node_modules/@remix-run/react/future/single-fetch.d.ts` to `include` in your `tsconfig.json`
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.5`
-
-## 2.9.0-pre.4
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.4`
-
-## 2.9.0-pre.3
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.3`
-
-## 2.9.0-pre.2
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.2`
-
-## 2.9.0-pre.1
-
-### Patch Changes
-
-- [REMOVE] Loosen header check on turbo stream responses for SSG compatibility ([#9162](https://github.com/remix-run/remix/pull/9162))
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.1`
-
-## 2.9.0-pre.0
+## 2.9.0
 
 ### Minor Changes
 
@@ -75,12 +13,13 @@
     - If you export your own streamTimeout, you should decouple that from aborting the react `renderToPipeableStream`. You should always ensure that react is aborted _afer_ the stream is aborted so that abort rejections can be flushed down
   - Actions no longer automatically revalidate on 4xx/5xx responses (via RR `future.unstable_skipActionErrorRevalidation` flag) - you can return a 2xx to opt-into revalidation or use `shouldRevalidate`
 
+- Opt-in types for single-fetch ([#9272](https://github.com/remix-run/remix/pull/9272))
+  - To opt-in to type inference for single-fetch, add `./node_modules/@remix-run/react/future/single-fetch.d.ts` to `include` in your `tsconfig.json`
+
 ### Patch Changes
 
-- fix: escape single fetch transfer ([#9084](https://github.com/remix-run/remix/pull/9084))
-- Update single fetch implementation to avoid over-fetching when clientLoader's exist ([#9073](https://github.com/remix-run/remix/pull/9073))
 - Updated dependencies:
-  - `@remix-run/server-runtime@2.9.0-pre.0`
+  - `@remix-run/server-runtime@2.9.0`
 
 ## 2.8.1
 
diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json
index 25ee4d3bd36..51e5a12dc01 100644
--- a/packages/remix-react/package.json
+++ b/packages/remix-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/react",
-  "version": "2.9.0-pre.8",
+  "version": "2.9.0",
   "description": "React DOM bindings for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-serve/CHANGELOG.md b/packages/remix-serve/CHANGELOG.md
index 593cc274ebd..1b739354d17 100644
--- a/packages/remix-serve/CHANGELOG.md
+++ b/packages/remix-serve/CHANGELOG.md
@@ -1,79 +1,18 @@
 # `@remix-run/serve`
 
-## 2.9.0-pre.8
+## 2.9.0
 
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/express@2.9.0-pre.8`
-  - `@remix-run/node@2.9.0-pre.8`
-
-## 2.9.0-pre.7
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/express@2.9.0-pre.7`
-  - `@remix-run/node@2.9.0-pre.7`
-
-## 2.9.0-pre.6
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/express@2.9.0-pre.6`
-  - `@remix-run/node@2.9.0-pre.6`
-
-## 2.9.0-pre.5
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/express@2.9.0-pre.5`
-  - `@remix-run/node@2.9.0-pre.5`
-
-## 2.9.0-pre.4
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.4`
-  - `@remix-run/express@2.9.0-pre.4`
-
-## 2.9.0-pre.3
-
-### Patch Changes
-
-- - Put `undici` fetch polyfill behind a new `installGlobals({ nativeFetch: true })` parameter ([#9198](https://github.com/remix-run/remix/pull/9198))
-  - `remix-serve` will default to using `undici` for the fetch polyfill if `future._unstable_singleFetch` is enabled because the single fetch implementation relies on the `undici` polyfill
-    - Any users opting into Single Fetch and managing their own polfill will need to pass the flag to `installGlobals` on their own to avoid runtime errors with Single Fetch
-- Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.3`
-  - `@remix-run/express@2.9.0-pre.3`
-
-## 2.9.0-pre.2
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/express@2.9.0-pre.2`
-  - `@remix-run/node@2.9.0-pre.2`
-
-## 2.9.0-pre.1
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.1`
-  - `@remix-run/express@2.9.0-pre.1`
+### Minor Changes
 
-## 2.9.0-pre.0
+- Put `undici` fetch polyfill behind a new `installGlobals({ nativeFetch: true })` parameter ([#9198](https://github.com/remix-run/remix/pull/9198))
+  - `remix-serve` will default to using `undici` for the fetch polyfill if `future.unstable_singleFetch` is enabled because the single fetch implementation relies on the `undici` polyfill
+  - Any users opting into Single Fetch and managing their own polyfill will need to pass the flag to `installGlobals` on their own to avoid runtime errors with Single Fetch
 
 ### Patch Changes
 
 - Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.0`
-  - `@remix-run/express@2.9.0-pre.0`
+  - `@remix-run/node@2.9.0`
+  - `@remix-run/express@2.9.0`
 
 ## 2.8.1
 
diff --git a/packages/remix-serve/package.json b/packages/remix-serve/package.json
index 711094ebb24..8589103d071 100644
--- a/packages/remix-serve/package.json
+++ b/packages/remix-serve/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/serve",
-  "version": "2.9.0-pre.8",
+  "version": "2.9.0",
   "description": "Production application server for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-server-runtime/CHANGELOG.md b/packages/remix-server-runtime/CHANGELOG.md
index 34f82eb9dcd..153f6a8f532 100644
--- a/packages/remix-server-runtime/CHANGELOG.md
+++ b/packages/remix-server-runtime/CHANGELOG.md
@@ -1,47 +1,17 @@
 # `@remix-run/server-runtime`
 
-## 2.9.0-pre.8
-
-## 2.9.0-pre.7
-
-## 2.9.0-pre.6
-
-## 2.9.0-pre.5
-
-## 2.9.0-pre.4
-
-### Patch Changes
-
-- [REMOVE] Fix typings for response in LoaderFunctonArgs/ActionFunctionArgs ([#9254](https://github.com/remix-run/remix/pull/9254))
-
-## 2.9.0-pre.3
-
-## 2.9.0-pre.2
-
-## 2.9.0-pre.1
-
-### Patch Changes
-
-- [REMOVE] Remove RR flags and implement via dataStrategy ([#9157](https://github.com/remix-run/remix/pull/9157))
-
-## 2.9.0-pre.0
+## 2.9.0
 
 ### Minor Changes
 
 - New `future.unstable_singleFetch` flag ([#8773](https://github.com/remix-run/remix/pull/8773))
-
   - Naked objects returned from loaders/actions are no longer automatically converted to JSON responses. They'll be streamed as-is via `turbo-stream` so `Date`'s will become `Date` through `useLoaderData()`
   - You can return naked objects with `Promise`'s without needing to use `defer()` - including nested `Promise`'s
     - If you need to return a custom status code or custom response headers, you can still use the `defer` utility
   - `<RemixServer abortDelay>` is no longer used. Instead, you should `export const streamTimeout` from `entry.server.tsx` and the remix server runtime will use that as the delay to abort the streamed response
     - If you export your own streamTimeout, you should decouple that from aborting the react `renderToPipeableStream`. You should always ensure that react is aborted _afer_ the stream is aborted so that abort rejections can be flushed down
   - Actions no longer automatically revalidate on 4xx/5xx responses (via RR `future.unstable_skipActionErrorRevalidation` flag) - you can return a 2xx to opt-into revalidation or use `shouldRevalidate`
-
-### Patch Changes
-
-- handle net new redirects created by handleDataRequest ([#9104](https://github.com/remix-run/remix/pull/9104))
 - Add `ResponseStub` header interface for single fetch and deprecate the `headers` export ([#9142](https://github.com/remix-run/remix/pull/9142))
-
   - The `headers` export is no longer used when single fetch is enabled
   - `loader`/`action` functions now receive a mutable `response` parameter
     - `type ResponseStub = { status: numbers | undefined, headers: Headers }`
@@ -62,6 +32,10 @@
   - You may still continue returning normal `Response` instances and they'll apply status codes in the same way, and will apply all headers via `headers.set` - overwriting any same-named header values from parents
     - If you need to append, you will need to switch from returning a `Response` instance to using the new `response` parameter
 
+### Patch Changes
+
+- Handle net new redirects created by handleDataRequest ([#9104](https://github.com/remix-run/remix/pull/9104))
+
 ## 2.8.1
 
 No significant changes to this package were made in this release. [See the repo `CHANGELOG.md`](https://github.com/remix-run/remix/blob/main/CHANGELOG.md) for an overview of all changes in v2.8.1.
diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json
index 28a6ae97d07..0ab621cd243 100644
--- a/packages/remix-server-runtime/package.json
+++ b/packages/remix-server-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/server-runtime",
-  "version": "2.9.0-pre.8",
+  "version": "2.9.0",
   "description": "Server runtime for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-testing/CHANGELOG.md b/packages/remix-testing/CHANGELOG.md
index e2c17541c27..91f22d6bfca 100644
--- a/packages/remix-testing/CHANGELOG.md
+++ b/packages/remix-testing/CHANGELOG.md
@@ -1,70 +1,6 @@
 # `@remix-run/testing`
 
-## 2.9.0-pre.8
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/react@2.9.0-pre.8`
-  - `@remix-run/node@2.9.0-pre.8`
-
-## 2.9.0-pre.7
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/react@2.9.0-pre.7`
-  - `@remix-run/node@2.9.0-pre.7`
-
-## 2.9.0-pre.6
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/react@2.9.0-pre.6`
-  - `@remix-run/node@2.9.0-pre.6`
-
-## 2.9.0-pre.5
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/react@2.9.0-pre.5`
-  - `@remix-run/node@2.9.0-pre.5`
-
-## 2.9.0-pre.4
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.4`
-  - `@remix-run/react@2.9.0-pre.4`
-
-## 2.9.0-pre.3
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.3`
-  - `@remix-run/react@2.9.0-pre.3`
-
-## 2.9.0-pre.2
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.2`
-  - `@remix-run/react@2.9.0-pre.2`
-
-## 2.9.0-pre.1
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/react@2.9.0-pre.1`
-  - `@remix-run/node@2.9.0-pre.1`
-
-## 2.9.0-pre.0
+## 2.9.0
 
 ### Minor Changes
 
@@ -80,8 +16,8 @@
 ### Patch Changes
 
 - Updated dependencies:
-  - `@remix-run/node@2.9.0-pre.0`
-  - `@remix-run/react@2.9.0-pre.0`
+  - `@remix-run/node@2.9.0`
+  - `@remix-run/react@2.9.0`
 
 ## 2.8.1
 
diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
index 76a253cd984..2939460027c 100644
--- a/packages/remix-testing/package.json
+++ b/packages/remix-testing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/testing",
-  "version": "2.9.0-pre.8",
+  "version": "2.9.0",
   "description": "Testing utilities for Remix apps",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix/package.json b/packages/remix/package.json
index 32ee0d278ec..fe49d90ef10 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "remix",
-  "version": "2.9.0-pre.8",
+  "version": "2.9.0",
   "description": "A framework for building better websites",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6093a43d010..912e0d7ff7e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -548,13 +548,13 @@ importers:
   integration/helpers/vite-cloudflare-template:
     dependencies:
       '@remix-run/cloudflare':
-        specifier: 2.9.0-pre.8
+        specifier: 2.9.0
         version: link:../../../packages/remix-cloudflare
       '@remix-run/cloudflare-pages':
-        specifier: 2.9.0-pre.8
+        specifier: 2.9.0
         version: link:../../../packages/remix-cloudflare-pages
       '@remix-run/react':
-        specifier: 2.9.0-pre.8
+        specifier: 2.9.0
         version: link:../../../packages/remix-react
       isbot:
         specifier: ^4.1.0
@@ -868,7 +868,7 @@ importers:
         specifier: workspace:*
         version: link:../remix-node
       '@remix-run/react':
-        specifier: ^2.9.0-pre.8
+        specifier: ^2.9.0
         version: link:../remix-react
       '@remix-run/router':
         specifier: 1.16.0

From 7184a4e0e86345c5d7f47219c9bf47a2bc0ea332 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Tue, 23 Apr 2024 14:01:44 -0400
Subject: [PATCH 087/108] Updates to single fetch docs (#9292)

---
 docs/guides/single-fetch.md | 55 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/docs/guides/single-fetch.md b/docs/guides/single-fetch.md
index 8eef8460577..1c0f5048555 100644
--- a/docs/guides/single-fetch.md
+++ b/docs/guides/single-fetch.md
@@ -50,6 +50,44 @@ Now that Remix is streaming internally, we can cancel the `turbo-stream` process
 
 You can control this by exporting a `streamTimeout` numeric value from your `entry.server.tsx` and Remix will use that as the number of milliseconds after which to reject any outstanding Promises from `loader`/`action`'s. It's recommended to decouple this value from the timeout in which you abort the React renderer - and you should always set the React timeout to a higher value so it has time to stream down the underlying rejections from your `streamTimeout`.
 
+```tsx filename=app/entry.server.tsx lines=[1-2,32-33]
+// Reject all pending promises from handler functions after 5 seconds
+export const streamTimeout = 5000;
+
+// ...
+
+function handleBrowserRequest(
+  request: Request,
+  responseStatusCode: number,
+  responseHeaders: Headers,
+  remixContext: EntryContext
+) {
+  return new Promise((resolve, reject) => {
+    const { pipe, abort } = renderToPipeableStream(
+      <RemixServer
+        context={remixContext}
+        url={request.url}
+        abortDelay={ABORT_DELAY}
+      />,
+      {
+        onShellReady() {
+          /* ... */
+        },
+        onShellError(error: unknown) {
+          /* ... */
+        },
+        onError(error: unknown) {
+          /* ... */
+        },
+      }
+    );
+
+    // Automatically timeout the react renderer after 10 seconds
+    setTimeout(abort, 10000);
+  });
+}
+```
+
 ### Type Inference
 
 Without Single Fetch, any plain Javascript object returned from a `loader` or `action` is automatically serialized into a JSON response (as if you returned it via `json`). The type inference assumes this is the case and infer naked object returns as if they were JSON serialized.
@@ -119,7 +157,9 @@ export default function Component() {
 
 Previously, Remix would always revalidate all active loaders after _any_ action submission, regardless of the result of the action. You could opt-out of revalidation on a per-route basis via [`shouldRevalidate`][should-revalidate].
 
-With Single Fetch, if an `action` returns or throws a `Response` with a `4xx/5xx` status code, Remix will _not revalidate_ loaders by default. You can then opt-into revalidation on a per-route basis. If an `action` returns or throws anything that is not a 4xx/5xx Response, then the revalidation behavior is unchanged. The reasoning here is that in most cases, if you return a `4xx`/`5xx` Response, you didn't actually mutate any data so there is no need to reload data.
+With Single Fetch, if an `action` returns or throws a `Response` with a `4xx/5xx` status code, Remix will _not revalidate_ loaders by default. If an `action` returns or throws anything that is not a 4xx/5xx Response, then the revalidation behavior is unchanged. The reasoning here is that in most cases, if you return a `4xx`/`5xx` Response, you didn't actually mutate any data so there is no need to reload data.
+
+If you _want_ to continue revalidating one or more loaders after a 4xx/5xx action response, you can opt-into revalidation on a per-route basis by returning `true` from your [`shouldRevalidate`][should-revalidate] function. There is also a new `unstable_actionStatus` parameter passed to the function that you can use if you need to decide based on the action status code.
 
 Revalidation is handled via a `?_routes` query string parameter on the single fetch HTTP call which limits the loaders being called. This means that when you are doing fine-grained revalidation, you will have cache enumerations based on the routes being requested - but all of the information is in the URL so you should not need any special CDN configurations (as opposed to if this was done via a custom header that required your CDN to respect the `Vary` header).
 
@@ -158,6 +198,19 @@ export async function action({
 }
 ```
 
+You can also throw these response stubs to short circuit the flow of your loaders and actions:
+
+```tsx
+export async function loader({ request, response }) {
+  if (shouldRedirectToHome(request)) {
+    response.status = 302;
+    response.headers.set("Location", "/");
+    throw response;
+  }
+  // ...
+}
+```
+
 Each `loader`/`action` receives it's own unique `response` instance so you cannot see what other `loader`/`action` functions have set (which would be subject to race conditions). The resulting HTTP Response status and headers are determined as follows:
 
 - Status Code

From b4ad93c76de5052a65999177ac9617ba318c798d Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Tue, 23 Apr 2024 17:59:50 -0400
Subject: [PATCH 088/108] Enter prerelease mode

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

diff --git a/.changeset/pre.json b/.changeset/pre.json
new file mode 100644
index 00000000000..ce4f13e41a0
--- /dev/null
+++ b/.changeset/pre.json
@@ -0,0 +1,29 @@
+{
+  "mode": "pre",
+  "tag": "pre",
+  "initialVersions": {
+    "integration": "0.0.0",
+    "integration-cf-template": "0.0.0",
+    "integration-deno-template": "0.0.0",
+    "integration-node-template": "0.0.0",
+    "integration-vite-cloudflare-template": "0.0.0",
+    "integration-vite-template": "0.0.0",
+    "create-remix": "2.9.0",
+    "remix": "2.9.0",
+    "@remix-run/architect": "2.9.0",
+    "@remix-run/cloudflare": "2.9.0",
+    "@remix-run/cloudflare-pages": "2.9.0",
+    "@remix-run/cloudflare-workers": "2.9.0",
+    "@remix-run/css-bundle": "2.9.0",
+    "@remix-run/deno": "2.9.0",
+    "@remix-run/dev": "2.9.0",
+    "@remix-run/eslint-config": "2.9.0",
+    "@remix-run/express": "2.9.0",
+    "@remix-run/node": "2.9.0",
+    "@remix-run/react": "2.9.0",
+    "@remix-run/serve": "2.9.0",
+    "@remix-run/server-runtime": "2.9.0",
+    "@remix-run/testing": "2.9.0"
+  },
+  "changesets": []
+}

From eb665b5afb0b39e9a24cd9239acb981969550fa7 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Tue, 23 Apr 2024 18:13:10 -0400
Subject: [PATCH 089/108] Ignore future d.ts files from TS build (#9299)

---
 .changeset/sweet-falcons-relax.md  | 5 +++++
 packages/remix-react/tsconfig.json | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/sweet-falcons-relax.md

diff --git a/.changeset/sweet-falcons-relax.md b/.changeset/sweet-falcons-relax.md
new file mode 100644
index 00000000000..78429d33d49
--- /dev/null
+++ b/.changeset/sweet-falcons-relax.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/react": patch
+---
+
+Ignore future/\*.d.ts files from TS build
diff --git a/packages/remix-react/tsconfig.json b/packages/remix-react/tsconfig.json
index a112732bcc6..a35422a111c 100644
--- a/packages/remix-react/tsconfig.json
+++ b/packages/remix-react/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "include": ["**/*.ts", "**/*.tsx"],
-  "exclude": ["dist", "__tests__", "node_modules"],
+  "exclude": ["future/*.d.ts", "dist", "__tests__", "node_modules"],
   "compilerOptions": {
     "lib": ["DOM", "DOM.Iterable", "ES2022"],
     "target": "ES2022",

From c5eda9a67ba02d03ca27b9a96ca0aeba21cce9b3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 23 Apr 2024 18:14:12 -0400
Subject: [PATCH 090/108] chore: Update version for release (pre) (#9300)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json                                    |  4 +++-
 .../helpers/vite-cloudflare-template/package.json      |  6 +++---
 packages/create-remix/CHANGELOG.md                     |  2 ++
 packages/create-remix/package.json                     |  2 +-
 packages/remix-architect/CHANGELOG.md                  |  7 +++++++
 packages/remix-architect/package.json                  |  2 +-
 packages/remix-cloudflare-pages/CHANGELOG.md           |  7 +++++++
 packages/remix-cloudflare-pages/package.json           |  2 +-
 packages/remix-cloudflare-workers/CHANGELOG.md         |  7 +++++++
 packages/remix-cloudflare-workers/package.json         |  2 +-
 packages/remix-cloudflare/CHANGELOG.md                 |  7 +++++++
 packages/remix-cloudflare/package.json                 |  2 +-
 packages/remix-css-bundle/CHANGELOG.md                 |  2 ++
 packages/remix-css-bundle/package.json                 |  2 +-
 packages/remix-deno/CHANGELOG.md                       |  7 +++++++
 packages/remix-deno/package.json                       |  2 +-
 packages/remix-dev/CHANGELOG.md                        | 10 ++++++++++
 packages/remix-dev/package.json                        |  6 +++---
 packages/remix-eslint-config/CHANGELOG.md              |  2 ++
 packages/remix-eslint-config/package.json              |  2 +-
 packages/remix-express/CHANGELOG.md                    |  7 +++++++
 packages/remix-express/package.json                    |  2 +-
 packages/remix-node/CHANGELOG.md                       |  7 +++++++
 packages/remix-node/package.json                       |  2 +-
 packages/remix-react/CHANGELOG.md                      |  8 ++++++++
 packages/remix-react/package.json                      |  2 +-
 packages/remix-serve/CHANGELOG.md                      |  8 ++++++++
 packages/remix-serve/package.json                      |  2 +-
 packages/remix-server-runtime/CHANGELOG.md             |  2 ++
 packages/remix-server-runtime/package.json             |  2 +-
 packages/remix-testing/CHANGELOG.md                    |  8 ++++++++
 packages/remix-testing/package.json                    |  2 +-
 packages/remix/package.json                            |  2 +-
 pnpm-lock.yaml                                         |  8 ++++----
 34 files changed, 119 insertions(+), 26 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index ce4f13e41a0..b56cd95b07d 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -25,5 +25,7 @@
     "@remix-run/server-runtime": "2.9.0",
     "@remix-run/testing": "2.9.0"
   },
-  "changesets": []
+  "changesets": [
+    "sweet-falcons-relax"
+  ]
 }
diff --git a/integration/helpers/vite-cloudflare-template/package.json b/integration/helpers/vite-cloudflare-template/package.json
index e0d8e439bd5..6ecd7df345a 100644
--- a/integration/helpers/vite-cloudflare-template/package.json
+++ b/integration/helpers/vite-cloudflare-template/package.json
@@ -11,9 +11,9 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/cloudflare": "2.9.0",
-    "@remix-run/cloudflare-pages": "2.9.0",
-    "@remix-run/react": "2.9.0",
+    "@remix-run/cloudflare": "2.9.1-pre.0",
+    "@remix-run/cloudflare-pages": "2.9.1-pre.0",
+    "@remix-run/react": "2.9.1-pre.0",
     "isbot": "^4.1.0",
     "miniflare": "^3.20231030.4",
     "react": "^18.2.0",
diff --git a/packages/create-remix/CHANGELOG.md b/packages/create-remix/CHANGELOG.md
index cbbaa818e27..ab8d5912536 100644
--- a/packages/create-remix/CHANGELOG.md
+++ b/packages/create-remix/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `create-remix`
 
+## 2.9.1-pre.0
+
 ## 2.9.0
 
 ### Patch Changes
diff --git a/packages/create-remix/package.json b/packages/create-remix/package.json
index b2a572af9d9..ddc133af20f 100644
--- a/packages/create-remix/package.json
+++ b/packages/create-remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-remix",
-  "version": "2.9.0",
+  "version": "2.9.1-pre.0",
   "description": "Create a new Remix app",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix-architect/CHANGELOG.md b/packages/remix-architect/CHANGELOG.md
index a339ea71e23..56b452374f7 100644
--- a/packages/remix-architect/CHANGELOG.md
+++ b/packages/remix-architect/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/architect`
 
+## 2.9.1-pre.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.1-pre.0`
+
 ## 2.9.0
 
 ### Patch Changes
diff --git a/packages/remix-architect/package.json b/packages/remix-architect/package.json
index d337c3d5092..9ea1a006188 100644
--- a/packages/remix-architect/package.json
+++ b/packages/remix-architect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/architect",
-  "version": "2.9.0",
+  "version": "2.9.1-pre.0",
   "description": "Architect server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare-pages/CHANGELOG.md b/packages/remix-cloudflare-pages/CHANGELOG.md
index d5b226d44d7..bc107cd51f0 100644
--- a/packages/remix-cloudflare-pages/CHANGELOG.md
+++ b/packages/remix-cloudflare-pages/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-pages`
 
+## 2.9.1-pre.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/cloudflare@2.9.1-pre.0`
+
 ## 2.9.0
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare-pages/package.json b/packages/remix-cloudflare-pages/package.json
index 2d1772220fb..1da2dd5b17b 100644
--- a/packages/remix-cloudflare-pages/package.json
+++ b/packages/remix-cloudflare-pages/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-pages",
-  "version": "2.9.0",
+  "version": "2.9.1-pre.0",
   "description": "Cloudflare Pages request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare-workers/CHANGELOG.md b/packages/remix-cloudflare-workers/CHANGELOG.md
index 808f1a4097c..2f964a01cfd 100644
--- a/packages/remix-cloudflare-workers/CHANGELOG.md
+++ b/packages/remix-cloudflare-workers/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-workers`
 
+## 2.9.1-pre.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/cloudflare@2.9.1-pre.0`
+
 ## 2.9.0
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare-workers/package.json b/packages/remix-cloudflare-workers/package.json
index 2eef3021b3e..6c056afb076 100644
--- a/packages/remix-cloudflare-workers/package.json
+++ b/packages/remix-cloudflare-workers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-workers",
-  "version": "2.9.0",
+  "version": "2.9.1-pre.0",
   "description": "Cloudflare worker request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare/CHANGELOG.md b/packages/remix-cloudflare/CHANGELOG.md
index 29e78b3e87f..5a05e69c06b 100644
--- a/packages/remix-cloudflare/CHANGELOG.md
+++ b/packages/remix-cloudflare/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare`
 
+## 2.9.1-pre.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.1-pre.0`
+
 ## 2.9.0
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare/package.json b/packages/remix-cloudflare/package.json
index b6d37143456..3feb19f241e 100644
--- a/packages/remix-cloudflare/package.json
+++ b/packages/remix-cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare",
-  "version": "2.9.0",
+  "version": "2.9.1-pre.0",
   "description": "Cloudflare platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-css-bundle/CHANGELOG.md b/packages/remix-css-bundle/CHANGELOG.md
index a4e38d1ee84..eb138eea000 100644
--- a/packages/remix-css-bundle/CHANGELOG.md
+++ b/packages/remix-css-bundle/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @remix-run/css-bundle
 
+## 2.9.1-pre.0
+
 ## 2.9.0
 
 No significant changes to this package were made in this release. [See the repo `CHANGELOG.md`](https://github.com/remix-run/remix/blob/main/CHANGELOG.md) for an overview of all changes in v2.9.0.
diff --git a/packages/remix-css-bundle/package.json b/packages/remix-css-bundle/package.json
index 2d938571cf1..2d9a4aa0ff3 100644
--- a/packages/remix-css-bundle/package.json
+++ b/packages/remix-css-bundle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/css-bundle",
-  "version": "2.9.0",
+  "version": "2.9.1-pre.0",
   "description": "CSS bundle href when using CSS bundling features in Remix",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix-deno/CHANGELOG.md b/packages/remix-deno/CHANGELOG.md
index bb0dd2e3962..502cdcc2ba6 100644
--- a/packages/remix-deno/CHANGELOG.md
+++ b/packages/remix-deno/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/deno`
 
+## 2.9.1-pre.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.1-pre.0`
+
 ## 2.9.0
 
 ### Patch Changes
diff --git a/packages/remix-deno/package.json b/packages/remix-deno/package.json
index b63dbf9b0f2..6b3afed33d5 100644
--- a/packages/remix-deno/package.json
+++ b/packages/remix-deno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/deno",
-  "version": "2.9.0",
+  "version": "2.9.1-pre.0",
   "description": "Deno platform abstractions for Remix",
   "homepage": "https://remix.run",
   "main": "./index.ts",
diff --git a/packages/remix-dev/CHANGELOG.md b/packages/remix-dev/CHANGELOG.md
index 527d7f844e9..73a6c651fc0 100644
--- a/packages/remix-dev/CHANGELOG.md
+++ b/packages/remix-dev/CHANGELOG.md
@@ -1,5 +1,15 @@
 # `@remix-run/dev`
 
+## 2.9.1-pre.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/react@2.9.1-pre.0`
+  - `@remix-run/node@2.9.1-pre.0`
+  - `@remix-run/serve@2.9.1-pre.0`
+  - `@remix-run/server-runtime@2.9.1-pre.0`
+
 ## 2.9.0
 
 ### Minor Changes
diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json
index 7fdea096978..3a5a73bc769 100644
--- a/packages/remix-dev/package.json
+++ b/packages/remix-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/dev",
-  "version": "2.9.0",
+  "version": "2.9.1-pre.0",
   "description": "Dev tools and CLI for Remix",
   "homepage": "https://remix.run",
   "bugs": {
@@ -106,8 +106,8 @@
     "wrangler": "^3.28.2"
   },
   "peerDependencies": {
-    "@remix-run/react": "^2.9.0",
-    "@remix-run/serve": "^2.9.0",
+    "@remix-run/react": "^2.9.1-pre.0",
+    "@remix-run/serve": "^2.9.1-pre.0",
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2"
diff --git a/packages/remix-eslint-config/CHANGELOG.md b/packages/remix-eslint-config/CHANGELOG.md
index 7698a29751e..09e37026663 100644
--- a/packages/remix-eslint-config/CHANGELOG.md
+++ b/packages/remix-eslint-config/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `@remix-run/eslint-config`
 
+## 2.9.1-pre.0
+
 ## 2.9.0
 
 No significant changes to this package were made in this release. [See the repo `CHANGELOG.md`](https://github.com/remix-run/remix/blob/main/CHANGELOG.md) for an overview of all changes in v2.9.0.
diff --git a/packages/remix-eslint-config/package.json b/packages/remix-eslint-config/package.json
index e2a9a8acb20..b5d38750b42 100644
--- a/packages/remix-eslint-config/package.json
+++ b/packages/remix-eslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/eslint-config",
-  "version": "2.9.0",
+  "version": "2.9.1-pre.0",
   "description": "ESLint configuration for Remix projects",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-express/CHANGELOG.md b/packages/remix-express/CHANGELOG.md
index 241eec25029..3ebc5bb9962 100644
--- a/packages/remix-express/CHANGELOG.md
+++ b/packages/remix-express/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/express`
 
+## 2.9.1-pre.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.1-pre.0`
+
 ## 2.9.0
 
 ### Patch Changes
diff --git a/packages/remix-express/package.json b/packages/remix-express/package.json
index 7571b65e244..11f7a536ab8 100644
--- a/packages/remix-express/package.json
+++ b/packages/remix-express/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/express",
-  "version": "2.9.0",
+  "version": "2.9.1-pre.0",
   "description": "Express server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-node/CHANGELOG.md b/packages/remix-node/CHANGELOG.md
index 7bad0a52712..46df4d876cd 100644
--- a/packages/remix-node/CHANGELOG.md
+++ b/packages/remix-node/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/node`
 
+## 2.9.1-pre.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.1-pre.0`
+
 ## 2.9.0
 
 ### Minor Changes
diff --git a/packages/remix-node/package.json b/packages/remix-node/package.json
index 88b5fd1c57b..9ec35dc2316 100644
--- a/packages/remix-node/package.json
+++ b/packages/remix-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/node",
-  "version": "2.9.0",
+  "version": "2.9.1-pre.0",
   "description": "Node.js platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-react/CHANGELOG.md b/packages/remix-react/CHANGELOG.md
index dda3ef5fd67..56d54088827 100644
--- a/packages/remix-react/CHANGELOG.md
+++ b/packages/remix-react/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/react`
 
+## 2.9.1-pre.0
+
+### Patch Changes
+
+- Ignore future/\*.d.ts files from TS build ([#9299](https://github.com/remix-run/remix/pull/9299))
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.1-pre.0`
+
 ## 2.9.0
 
 ### Minor Changes
diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json
index 51e5a12dc01..8fbb6a763eb 100644
--- a/packages/remix-react/package.json
+++ b/packages/remix-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/react",
-  "version": "2.9.0",
+  "version": "2.9.1-pre.0",
   "description": "React DOM bindings for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-serve/CHANGELOG.md b/packages/remix-serve/CHANGELOG.md
index 1b739354d17..59a9eb76f3b 100644
--- a/packages/remix-serve/CHANGELOG.md
+++ b/packages/remix-serve/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/serve`
 
+## 2.9.1-pre.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/express@2.9.1-pre.0`
+  - `@remix-run/node@2.9.1-pre.0`
+
 ## 2.9.0
 
 ### Minor Changes
diff --git a/packages/remix-serve/package.json b/packages/remix-serve/package.json
index 8589103d071..839e9763c4d 100644
--- a/packages/remix-serve/package.json
+++ b/packages/remix-serve/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/serve",
-  "version": "2.9.0",
+  "version": "2.9.1-pre.0",
   "description": "Production application server for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-server-runtime/CHANGELOG.md b/packages/remix-server-runtime/CHANGELOG.md
index 153f6a8f532..aebefec5f6c 100644
--- a/packages/remix-server-runtime/CHANGELOG.md
+++ b/packages/remix-server-runtime/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `@remix-run/server-runtime`
 
+## 2.9.1-pre.0
+
 ## 2.9.0
 
 ### Minor Changes
diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json
index 0ab621cd243..6a0342c7987 100644
--- a/packages/remix-server-runtime/package.json
+++ b/packages/remix-server-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/server-runtime",
-  "version": "2.9.0",
+  "version": "2.9.1-pre.0",
   "description": "Server runtime for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-testing/CHANGELOG.md b/packages/remix-testing/CHANGELOG.md
index 91f22d6bfca..65b697afb6a 100644
--- a/packages/remix-testing/CHANGELOG.md
+++ b/packages/remix-testing/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/testing`
 
+## 2.9.1-pre.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/react@2.9.1-pre.0`
+  - `@remix-run/node@2.9.1-pre.0`
+
 ## 2.9.0
 
 ### Minor Changes
diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
index 2939460027c..ba4158642f7 100644
--- a/packages/remix-testing/package.json
+++ b/packages/remix-testing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/testing",
-  "version": "2.9.0",
+  "version": "2.9.1-pre.0",
   "description": "Testing utilities for Remix apps",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix/package.json b/packages/remix/package.json
index fe49d90ef10..e0c45a3e613 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "remix",
-  "version": "2.9.0",
+  "version": "2.9.1-pre.0",
   "description": "A framework for building better websites",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 912e0d7ff7e..6bc5d20ec4d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -548,13 +548,13 @@ importers:
   integration/helpers/vite-cloudflare-template:
     dependencies:
       '@remix-run/cloudflare':
-        specifier: 2.9.0
+        specifier: 2.9.1-pre.0
         version: link:../../../packages/remix-cloudflare
       '@remix-run/cloudflare-pages':
-        specifier: 2.9.0
+        specifier: 2.9.1-pre.0
         version: link:../../../packages/remix-cloudflare-pages
       '@remix-run/react':
-        specifier: 2.9.0
+        specifier: 2.9.1-pre.0
         version: link:../../../packages/remix-react
       isbot:
         specifier: ^4.1.0
@@ -868,7 +868,7 @@ importers:
         specifier: workspace:*
         version: link:../remix-node
       '@remix-run/react':
-        specifier: ^2.9.0
+        specifier: ^2.9.1-pre.0
         version: link:../remix-react
       '@remix-run/router':
         specifier: 1.16.0

From 4e98f4160155ddc6c1ac4490337f8f5f9ad140cf Mon Sep 17 00:00:00 2001
From: Mark Dalgleish <mark.john.dalgleish@gmail.com>
Date: Wed, 24 Apr 2024 10:54:39 +1000
Subject: [PATCH 091/108] Only add Remix packages to `ssr.external` in Remix
 repo (#9301)

---
 .changeset/thirty-donuts-clean.md |  5 ++++
 packages/remix-dev/vite/plugin.ts | 44 ++++++++++++++++++-------------
 2 files changed, 31 insertions(+), 18 deletions(-)
 create mode 100644 .changeset/thirty-donuts-clean.md

diff --git a/.changeset/thirty-donuts-clean.md b/.changeset/thirty-donuts-clean.md
new file mode 100644
index 00000000000..949f5d8d200
--- /dev/null
+++ b/.changeset/thirty-donuts-clean.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/dev": patch
+---
+
+Fix issue where consumers who had added Remix packages to Vite's `ssr.noExternal` option were being overridden by the Remix Vite plugin adding Remix packages to Vite's `ssr.external` option.
diff --git a/packages/remix-dev/vite/plugin.ts b/packages/remix-dev/vite/plugin.ts
index 0366cec8f08..a2c563594b3 100644
--- a/packages/remix-dev/vite/plugin.ts
+++ b/packages/remix-dev/vite/plugin.ts
@@ -1054,24 +1054,26 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
               : "custom",
 
           ssr: {
-            external: [
-              // This is only necessary for development within the Remix repo
-              // because these packages are symlinked and Vite treats them as
-              // internal source code. For consumers this is a no-op.
-              "@remix-run/architect",
-              "@remix-run/cloudflare-pages",
-              "@remix-run/cloudflare-workers",
-              "@remix-run/cloudflare",
-              "@remix-run/css-bundle",
-              "@remix-run/deno",
-              "@remix-run/dev",
-              "@remix-run/express",
-              "@remix-run/netlify",
-              "@remix-run/node",
-              "@remix-run/react",
-              "@remix-run/serve",
-              "@remix-run/server-runtime",
-            ],
+            external: isInRemixMonorepo()
+              ? [
+                  // This is only needed within the Remix repo because these
+                  // packages are linked to a directory outside of node_modules
+                  // so Vite treats them as internal code by default.
+                  "@remix-run/architect",
+                  "@remix-run/cloudflare-pages",
+                  "@remix-run/cloudflare-workers",
+                  "@remix-run/cloudflare",
+                  "@remix-run/css-bundle",
+                  "@remix-run/deno",
+                  "@remix-run/dev",
+                  "@remix-run/express",
+                  "@remix-run/netlify",
+                  "@remix-run/node",
+                  "@remix-run/react",
+                  "@remix-run/serve",
+                  "@remix-run/server-runtime",
+                ]
+              : undefined,
           },
           optimizeDeps: {
             include: [
@@ -1771,6 +1773,12 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
   ];
 };
 
+function isInRemixMonorepo() {
+  let devPath = path.dirname(require.resolve("@remix-run/dev/package.json"));
+  let devParentDir = path.basename(path.resolve(devPath, ".."));
+  return devParentDir === "packages";
+}
+
 function isEqualJson(v1: unknown, v2: unknown) {
   return JSON.stringify(v1) === JSON.stringify(v2);
 }

From 9785383e92b4d6641d0cda67e0ac37515ea1d831 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 24 Apr 2024 11:14:52 +1000
Subject: [PATCH 092/108] chore: Update version for release (pre) (#9302)

---
 .changeset/pre.json                                      | 3 ++-
 .../helpers/vite-cloudflare-template/package.json        | 6 +++---
 packages/create-remix/CHANGELOG.md                       | 2 ++
 packages/create-remix/package.json                       | 2 +-
 packages/remix-architect/CHANGELOG.md                    | 7 +++++++
 packages/remix-architect/package.json                    | 2 +-
 packages/remix-cloudflare-pages/CHANGELOG.md             | 7 +++++++
 packages/remix-cloudflare-pages/package.json             | 2 +-
 packages/remix-cloudflare-workers/CHANGELOG.md           | 7 +++++++
 packages/remix-cloudflare-workers/package.json           | 2 +-
 packages/remix-cloudflare/CHANGELOG.md                   | 7 +++++++
 packages/remix-cloudflare/package.json                   | 2 +-
 packages/remix-css-bundle/CHANGELOG.md                   | 2 ++
 packages/remix-css-bundle/package.json                   | 2 +-
 packages/remix-deno/CHANGELOG.md                         | 7 +++++++
 packages/remix-deno/package.json                         | 2 +-
 packages/remix-dev/CHANGELOG.md                          | 9 +++++++++
 packages/remix-dev/package.json                          | 6 +++---
 packages/remix-eslint-config/CHANGELOG.md                | 2 ++
 packages/remix-eslint-config/package.json                | 2 +-
 packages/remix-express/CHANGELOG.md                      | 7 +++++++
 packages/remix-express/package.json                      | 2 +-
 packages/remix-node/CHANGELOG.md                         | 7 +++++++
 packages/remix-node/package.json                         | 2 +-
 packages/remix-react/CHANGELOG.md                        | 7 +++++++
 packages/remix-react/package.json                        | 2 +-
 packages/remix-serve/CHANGELOG.md                        | 8 ++++++++
 packages/remix-serve/package.json                        | 2 +-
 packages/remix-server-runtime/CHANGELOG.md               | 2 ++
 packages/remix-server-runtime/package.json               | 2 +-
 packages/remix-testing/CHANGELOG.md                      | 8 ++++++++
 packages/remix-testing/package.json                      | 2 +-
 packages/remix/package.json                              | 2 +-
 pnpm-lock.yaml                                           | 8 ++++----
 34 files changed, 116 insertions(+), 26 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index b56cd95b07d..39b373a2088 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -26,6 +26,7 @@
     "@remix-run/testing": "2.9.0"
   },
   "changesets": [
-    "sweet-falcons-relax"
+    "sweet-falcons-relax",
+    "thirty-donuts-clean"
   ]
 }
diff --git a/integration/helpers/vite-cloudflare-template/package.json b/integration/helpers/vite-cloudflare-template/package.json
index 6ecd7df345a..4cd9d4ce9c0 100644
--- a/integration/helpers/vite-cloudflare-template/package.json
+++ b/integration/helpers/vite-cloudflare-template/package.json
@@ -11,9 +11,9 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/cloudflare": "2.9.1-pre.0",
-    "@remix-run/cloudflare-pages": "2.9.1-pre.0",
-    "@remix-run/react": "2.9.1-pre.0",
+    "@remix-run/cloudflare": "2.9.1-pre.1",
+    "@remix-run/cloudflare-pages": "2.9.1-pre.1",
+    "@remix-run/react": "2.9.1-pre.1",
     "isbot": "^4.1.0",
     "miniflare": "^3.20231030.4",
     "react": "^18.2.0",
diff --git a/packages/create-remix/CHANGELOG.md b/packages/create-remix/CHANGELOG.md
index ab8d5912536..41b221c512c 100644
--- a/packages/create-remix/CHANGELOG.md
+++ b/packages/create-remix/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `create-remix`
 
+## 2.9.1-pre.1
+
 ## 2.9.1-pre.0
 
 ## 2.9.0
diff --git a/packages/create-remix/package.json b/packages/create-remix/package.json
index ddc133af20f..c101e0df3b6 100644
--- a/packages/create-remix/package.json
+++ b/packages/create-remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-remix",
-  "version": "2.9.1-pre.0",
+  "version": "2.9.1-pre.1",
   "description": "Create a new Remix app",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix-architect/CHANGELOG.md b/packages/remix-architect/CHANGELOG.md
index 56b452374f7..c953fc14dd7 100644
--- a/packages/remix-architect/CHANGELOG.md
+++ b/packages/remix-architect/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/architect`
 
+## 2.9.1-pre.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.1-pre.1`
+
 ## 2.9.1-pre.0
 
 ### Patch Changes
diff --git a/packages/remix-architect/package.json b/packages/remix-architect/package.json
index 9ea1a006188..958a2259395 100644
--- a/packages/remix-architect/package.json
+++ b/packages/remix-architect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/architect",
-  "version": "2.9.1-pre.0",
+  "version": "2.9.1-pre.1",
   "description": "Architect server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare-pages/CHANGELOG.md b/packages/remix-cloudflare-pages/CHANGELOG.md
index bc107cd51f0..14a242e57bc 100644
--- a/packages/remix-cloudflare-pages/CHANGELOG.md
+++ b/packages/remix-cloudflare-pages/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-pages`
 
+## 2.9.1-pre.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/cloudflare@2.9.1-pre.1`
+
 ## 2.9.1-pre.0
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare-pages/package.json b/packages/remix-cloudflare-pages/package.json
index 1da2dd5b17b..0060814a029 100644
--- a/packages/remix-cloudflare-pages/package.json
+++ b/packages/remix-cloudflare-pages/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-pages",
-  "version": "2.9.1-pre.0",
+  "version": "2.9.1-pre.1",
   "description": "Cloudflare Pages request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare-workers/CHANGELOG.md b/packages/remix-cloudflare-workers/CHANGELOG.md
index 2f964a01cfd..341e1642cfb 100644
--- a/packages/remix-cloudflare-workers/CHANGELOG.md
+++ b/packages/remix-cloudflare-workers/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-workers`
 
+## 2.9.1-pre.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/cloudflare@2.9.1-pre.1`
+
 ## 2.9.1-pre.0
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare-workers/package.json b/packages/remix-cloudflare-workers/package.json
index 6c056afb076..4ab542ca056 100644
--- a/packages/remix-cloudflare-workers/package.json
+++ b/packages/remix-cloudflare-workers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-workers",
-  "version": "2.9.1-pre.0",
+  "version": "2.9.1-pre.1",
   "description": "Cloudflare worker request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare/CHANGELOG.md b/packages/remix-cloudflare/CHANGELOG.md
index 5a05e69c06b..ac31927ed6a 100644
--- a/packages/remix-cloudflare/CHANGELOG.md
+++ b/packages/remix-cloudflare/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare`
 
+## 2.9.1-pre.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.1-pre.1`
+
 ## 2.9.1-pre.0
 
 ### Patch Changes
diff --git a/packages/remix-cloudflare/package.json b/packages/remix-cloudflare/package.json
index 3feb19f241e..92cd03a80aa 100644
--- a/packages/remix-cloudflare/package.json
+++ b/packages/remix-cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare",
-  "version": "2.9.1-pre.0",
+  "version": "2.9.1-pre.1",
   "description": "Cloudflare platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-css-bundle/CHANGELOG.md b/packages/remix-css-bundle/CHANGELOG.md
index eb138eea000..8ae836868b9 100644
--- a/packages/remix-css-bundle/CHANGELOG.md
+++ b/packages/remix-css-bundle/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @remix-run/css-bundle
 
+## 2.9.1-pre.1
+
 ## 2.9.1-pre.0
 
 ## 2.9.0
diff --git a/packages/remix-css-bundle/package.json b/packages/remix-css-bundle/package.json
index 2d9a4aa0ff3..6837824d288 100644
--- a/packages/remix-css-bundle/package.json
+++ b/packages/remix-css-bundle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/css-bundle",
-  "version": "2.9.1-pre.0",
+  "version": "2.9.1-pre.1",
   "description": "CSS bundle href when using CSS bundling features in Remix",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix-deno/CHANGELOG.md b/packages/remix-deno/CHANGELOG.md
index 502cdcc2ba6..6c49406708b 100644
--- a/packages/remix-deno/CHANGELOG.md
+++ b/packages/remix-deno/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/deno`
 
+## 2.9.1-pre.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.1-pre.1`
+
 ## 2.9.1-pre.0
 
 ### Patch Changes
diff --git a/packages/remix-deno/package.json b/packages/remix-deno/package.json
index 6b3afed33d5..f881cc4b843 100644
--- a/packages/remix-deno/package.json
+++ b/packages/remix-deno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/deno",
-  "version": "2.9.1-pre.0",
+  "version": "2.9.1-pre.1",
   "description": "Deno platform abstractions for Remix",
   "homepage": "https://remix.run",
   "main": "./index.ts",
diff --git a/packages/remix-dev/CHANGELOG.md b/packages/remix-dev/CHANGELOG.md
index 73a6c651fc0..f075638b079 100644
--- a/packages/remix-dev/CHANGELOG.md
+++ b/packages/remix-dev/CHANGELOG.md
@@ -1,5 +1,14 @@
 # `@remix-run/dev`
 
+## 2.9.1-pre.1
+
+### Patch Changes
+
+- Fix issue where consumers who had added Remix packages to Vite's `ssr.noExternal` option were being overridden by the Remix Vite plugin adding Remix packages to Vite's `ssr.external` option. ([#9301](https://github.com/remix-run/remix/pull/9301))
+- Updated dependencies:
+  - `@remix-run/node@2.9.1-pre.1`
+  - `@remix-run/server-runtime@2.9.1-pre.1`
+
 ## 2.9.1-pre.0
 
 ### Patch Changes
diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json
index 3a5a73bc769..3f04fb59501 100644
--- a/packages/remix-dev/package.json
+++ b/packages/remix-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/dev",
-  "version": "2.9.1-pre.0",
+  "version": "2.9.1-pre.1",
   "description": "Dev tools and CLI for Remix",
   "homepage": "https://remix.run",
   "bugs": {
@@ -106,8 +106,8 @@
     "wrangler": "^3.28.2"
   },
   "peerDependencies": {
-    "@remix-run/react": "^2.9.1-pre.0",
-    "@remix-run/serve": "^2.9.1-pre.0",
+    "@remix-run/react": "^2.9.1-pre.1",
+    "@remix-run/serve": "^2.9.1-pre.1",
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2"
diff --git a/packages/remix-eslint-config/CHANGELOG.md b/packages/remix-eslint-config/CHANGELOG.md
index 09e37026663..96c652c2048 100644
--- a/packages/remix-eslint-config/CHANGELOG.md
+++ b/packages/remix-eslint-config/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `@remix-run/eslint-config`
 
+## 2.9.1-pre.1
+
 ## 2.9.1-pre.0
 
 ## 2.9.0
diff --git a/packages/remix-eslint-config/package.json b/packages/remix-eslint-config/package.json
index b5d38750b42..682f24f0e6b 100644
--- a/packages/remix-eslint-config/package.json
+++ b/packages/remix-eslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/eslint-config",
-  "version": "2.9.1-pre.0",
+  "version": "2.9.1-pre.1",
   "description": "ESLint configuration for Remix projects",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-express/CHANGELOG.md b/packages/remix-express/CHANGELOG.md
index 3ebc5bb9962..95bb369e69d 100644
--- a/packages/remix-express/CHANGELOG.md
+++ b/packages/remix-express/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/express`
 
+## 2.9.1-pre.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.1-pre.1`
+
 ## 2.9.1-pre.0
 
 ### Patch Changes
diff --git a/packages/remix-express/package.json b/packages/remix-express/package.json
index 11f7a536ab8..435d7c21fb3 100644
--- a/packages/remix-express/package.json
+++ b/packages/remix-express/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/express",
-  "version": "2.9.1-pre.0",
+  "version": "2.9.1-pre.1",
   "description": "Express server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-node/CHANGELOG.md b/packages/remix-node/CHANGELOG.md
index 46df4d876cd..a04ad347f1f 100644
--- a/packages/remix-node/CHANGELOG.md
+++ b/packages/remix-node/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/node`
 
+## 2.9.1-pre.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.1-pre.1`
+
 ## 2.9.1-pre.0
 
 ### Patch Changes
diff --git a/packages/remix-node/package.json b/packages/remix-node/package.json
index 9ec35dc2316..5187c104801 100644
--- a/packages/remix-node/package.json
+++ b/packages/remix-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/node",
-  "version": "2.9.1-pre.0",
+  "version": "2.9.1-pre.1",
   "description": "Node.js platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-react/CHANGELOG.md b/packages/remix-react/CHANGELOG.md
index 56d54088827..71c5c259e57 100644
--- a/packages/remix-react/CHANGELOG.md
+++ b/packages/remix-react/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/react`
 
+## 2.9.1-pre.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@2.9.1-pre.1`
+
 ## 2.9.1-pre.0
 
 ### Patch Changes
diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json
index 8fbb6a763eb..71cf3cbe40d 100644
--- a/packages/remix-react/package.json
+++ b/packages/remix-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/react",
-  "version": "2.9.1-pre.0",
+  "version": "2.9.1-pre.1",
   "description": "React DOM bindings for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-serve/CHANGELOG.md b/packages/remix-serve/CHANGELOG.md
index 59a9eb76f3b..25a36bbfe65 100644
--- a/packages/remix-serve/CHANGELOG.md
+++ b/packages/remix-serve/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/serve`
 
+## 2.9.1-pre.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/express@2.9.1-pre.1`
+  - `@remix-run/node@2.9.1-pre.1`
+
 ## 2.9.1-pre.0
 
 ### Patch Changes
diff --git a/packages/remix-serve/package.json b/packages/remix-serve/package.json
index 839e9763c4d..c8dc034d4c0 100644
--- a/packages/remix-serve/package.json
+++ b/packages/remix-serve/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/serve",
-  "version": "2.9.1-pre.0",
+  "version": "2.9.1-pre.1",
   "description": "Production application server for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-server-runtime/CHANGELOG.md b/packages/remix-server-runtime/CHANGELOG.md
index aebefec5f6c..66f77029682 100644
--- a/packages/remix-server-runtime/CHANGELOG.md
+++ b/packages/remix-server-runtime/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `@remix-run/server-runtime`
 
+## 2.9.1-pre.1
+
 ## 2.9.1-pre.0
 
 ## 2.9.0
diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json
index 6a0342c7987..fd2efb08028 100644
--- a/packages/remix-server-runtime/package.json
+++ b/packages/remix-server-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/server-runtime",
-  "version": "2.9.1-pre.0",
+  "version": "2.9.1-pre.1",
   "description": "Server runtime for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-testing/CHANGELOG.md b/packages/remix-testing/CHANGELOG.md
index 65b697afb6a..448f188f87b 100644
--- a/packages/remix-testing/CHANGELOG.md
+++ b/packages/remix-testing/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/testing`
 
+## 2.9.1-pre.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@2.9.1-pre.1`
+  - `@remix-run/react@2.9.1-pre.1`
+
 ## 2.9.1-pre.0
 
 ### Patch Changes
diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
index ba4158642f7..9ec05e0be44 100644
--- a/packages/remix-testing/package.json
+++ b/packages/remix-testing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/testing",
-  "version": "2.9.1-pre.0",
+  "version": "2.9.1-pre.1",
   "description": "Testing utilities for Remix apps",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix/package.json b/packages/remix/package.json
index e0c45a3e613..f2e4f4d0012 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "remix",
-  "version": "2.9.1-pre.0",
+  "version": "2.9.1-pre.1",
   "description": "A framework for building better websites",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6bc5d20ec4d..7a3cbb3400a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -548,13 +548,13 @@ importers:
   integration/helpers/vite-cloudflare-template:
     dependencies:
       '@remix-run/cloudflare':
-        specifier: 2.9.1-pre.0
+        specifier: 2.9.1-pre.1
         version: link:../../../packages/remix-cloudflare
       '@remix-run/cloudflare-pages':
-        specifier: 2.9.1-pre.0
+        specifier: 2.9.1-pre.1
         version: link:../../../packages/remix-cloudflare-pages
       '@remix-run/react':
-        specifier: 2.9.1-pre.0
+        specifier: 2.9.1-pre.1
         version: link:../../../packages/remix-react
       isbot:
         specifier: ^4.1.0
@@ -868,7 +868,7 @@ importers:
         specifier: workspace:*
         version: link:../remix-node
       '@remix-run/react':
-        specifier: ^2.9.1-pre.0
+        specifier: ^2.9.1-pre.1
         version: link:../remix-react
       '@remix-run/router':
         specifier: 1.16.0

From c53eb7dcc48326c240f601c5ab070d95a63fc152 Mon Sep 17 00:00:00 2001
From: Mark Dalgleish <mark.john.dalgleish@gmail.com>
Date: Wed, 24 Apr 2024 13:29:09 +1000
Subject: [PATCH 093/108] Remove `@remix-run/node` from Vite's
 `optimizeDeps.include` (#9287)

---
 .changeset/nasty-pandas-accept.md | 5 +++++
 packages/remix-dev/vite/plugin.ts | 7 -------
 2 files changed, 5 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/nasty-pandas-accept.md

diff --git a/.changeset/nasty-pandas-accept.md b/.changeset/nasty-pandas-accept.md
new file mode 100644
index 00000000000..ddae17ecf52
--- /dev/null
+++ b/.changeset/nasty-pandas-accept.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/dev": patch
+---
+
+Remove `@remix-run/node` from Vite plugin's `optimizeDeps.include` list since it was unnecessary and resulted in Vite warnings when not depending on this package.
diff --git a/packages/remix-dev/vite/plugin.ts b/packages/remix-dev/vite/plugin.ts
index b5c0e7b2ad3..927322d97c0 100644
--- a/packages/remix-dev/vite/plugin.ts
+++ b/packages/remix-dev/vite/plugin.ts
@@ -1089,13 +1089,6 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
               // That means that before Vite pre-bundles dependencies (e.g. first time dev server is run)
               // mismatching Remix routers cause `Error: You must render this element inside a <Remix> element`.
               "@remix-run/react",
-
-              // For some reason, the `vite-dotenv` integration test consistently fails on webkit
-              // with `504 (Outdated Optimize Dep)` from Vite  unless `@remix-run/node` is included
-              // in `optimizeDeps.include`. 🤷
-              // This could be caused by how we copy `node_modules/` into integration test fixtures,
-              // so maybe this will be unnecessary once we switch to pnpm
-              "@remix-run/node",
             ],
           },
           esbuild: {

From 6df29024669b3462fcc869905a295084234b5853 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Wed, 24 Apr 2024 10:59:24 -0400
Subject: [PATCH 094/108] Exit prerelease mode

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

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

From f72d26878ff38dad4d1f6fe743dca27ddd90e3a7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 24 Apr 2024 11:12:20 -0400
Subject: [PATCH 095/108] chore: Update version for release (#9308)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Matt Brophy <matt@brophy.org>
---
 .changeset/pre.json                           | 32 -------------------
 .changeset/sweet-falcons-relax.md             |  5 ---
 .changeset/thirty-donuts-clean.md             |  5 ---
 CHANGELOG.md                                  | 16 ++++++++++
 .../vite-cloudflare-template/package.json     |  6 ++--
 packages/create-remix/CHANGELOG.md            |  4 +--
 packages/create-remix/package.json            |  2 +-
 packages/remix-architect/CHANGELOG.md         | 11 ++-----
 packages/remix-architect/package.json         |  2 +-
 packages/remix-cloudflare-pages/CHANGELOG.md  | 11 ++-----
 packages/remix-cloudflare-pages/package.json  |  2 +-
 .../remix-cloudflare-workers/CHANGELOG.md     | 11 ++-----
 .../remix-cloudflare-workers/package.json     |  2 +-
 packages/remix-cloudflare/CHANGELOG.md        | 11 ++-----
 packages/remix-cloudflare/package.json        |  2 +-
 packages/remix-css-bundle/CHANGELOG.md        |  4 +--
 packages/remix-css-bundle/package.json        |  2 +-
 packages/remix-deno/CHANGELOG.md              | 11 ++-----
 packages/remix-deno/package.json              |  2 +-
 packages/remix-dev/CHANGELOG.md               | 18 +++--------
 packages/remix-dev/package.json               |  6 ++--
 packages/remix-eslint-config/CHANGELOG.md     |  4 +--
 packages/remix-eslint-config/package.json     |  2 +-
 packages/remix-express/CHANGELOG.md           | 11 ++-----
 packages/remix-express/package.json           |  2 +-
 packages/remix-node/CHANGELOG.md              | 11 ++-----
 packages/remix-node/package.json              |  2 +-
 packages/remix-react/CHANGELOG.md             | 13 ++------
 packages/remix-react/package.json             |  2 +-
 packages/remix-serve/CHANGELOG.md             | 14 ++------
 packages/remix-serve/package.json             |  2 +-
 packages/remix-server-runtime/CHANGELOG.md    |  4 +--
 packages/remix-server-runtime/package.json    |  2 +-
 packages/remix-testing/CHANGELOG.md           | 14 ++------
 packages/remix-testing/package.json           |  2 +-
 packages/remix/package.json                   |  2 +-
 pnpm-lock.yaml                                |  8 ++---
 37 files changed, 76 insertions(+), 184 deletions(-)
 delete mode 100644 .changeset/pre.json
 delete mode 100644 .changeset/sweet-falcons-relax.md
 delete mode 100644 .changeset/thirty-donuts-clean.md

diff --git a/.changeset/pre.json b/.changeset/pre.json
deleted file mode 100644
index fa5045e55b2..00000000000
--- a/.changeset/pre.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "mode": "exit",
-  "tag": "pre",
-  "initialVersions": {
-    "integration": "0.0.0",
-    "integration-cf-template": "0.0.0",
-    "integration-deno-template": "0.0.0",
-    "integration-node-template": "0.0.0",
-    "integration-vite-cloudflare-template": "0.0.0",
-    "integration-vite-template": "0.0.0",
-    "create-remix": "2.9.0",
-    "remix": "2.9.0",
-    "@remix-run/architect": "2.9.0",
-    "@remix-run/cloudflare": "2.9.0",
-    "@remix-run/cloudflare-pages": "2.9.0",
-    "@remix-run/cloudflare-workers": "2.9.0",
-    "@remix-run/css-bundle": "2.9.0",
-    "@remix-run/deno": "2.9.0",
-    "@remix-run/dev": "2.9.0",
-    "@remix-run/eslint-config": "2.9.0",
-    "@remix-run/express": "2.9.0",
-    "@remix-run/node": "2.9.0",
-    "@remix-run/react": "2.9.0",
-    "@remix-run/serve": "2.9.0",
-    "@remix-run/server-runtime": "2.9.0",
-    "@remix-run/testing": "2.9.0"
-  },
-  "changesets": [
-    "sweet-falcons-relax",
-    "thirty-donuts-clean"
-  ]
-}
diff --git a/.changeset/sweet-falcons-relax.md b/.changeset/sweet-falcons-relax.md
deleted file mode 100644
index 78429d33d49..00000000000
--- a/.changeset/sweet-falcons-relax.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@remix-run/react": patch
----
-
-Ignore future/\*.d.ts files from TS build
diff --git a/.changeset/thirty-donuts-clean.md b/.changeset/thirty-donuts-clean.md
deleted file mode 100644
index 949f5d8d200..00000000000
--- a/.changeset/thirty-donuts-clean.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@remix-run/dev": patch
----
-
-Fix issue where consumers who had added Remix packages to Vite's `ssr.noExternal` option were being overridden by the Remix Vite plugin adding Remix packages to Vite's `ssr.external` option.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69b4bb5346f..3acc1fb445b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -167,6 +167,22 @@ Date: YYYY-MM-DD
 
 -->
 
+## v2.9.1
+
+Date: 2024-04-24
+
+### Patch Changes
+
+- `@remix-run/dev` - Fix issue where consumers who had added Remix packages to Vite's `ssr.noExternal` option were being overridden by the Remix Vite plugin adding Remix packages to Vite's `ssr.external` option ([#9301](https://github.com/remix-run/remix/pull/9301))
+- `@remix-run/react` - Ignore `future/*.d.ts` files from TS build ([#9299](https://github.com/remix-run/remix/pull/9299))
+
+### Changes by Package
+
+- [`@remix-run/dev`](https://github.com/remix-run/remix/blob/remix%402.9.1/packages/remix-dev/CHANGELOG.md#291)
+- [`@remix-run/react`](https://github.com/remix-run/remix/blob/remix%402.9.1/packages/remix-react/CHANGELOG.md#291)
+
+**Full Changelog**: [`v2.9.0...v2.9.1`](https://github.com/remix-run/remix/compare/remix@2.9.0...remix@2.9.1)
+
 ## v2.9.0
 
 Date: 2024-04-23
diff --git a/integration/helpers/vite-cloudflare-template/package.json b/integration/helpers/vite-cloudflare-template/package.json
index 4cd9d4ce9c0..b90958c2942 100644
--- a/integration/helpers/vite-cloudflare-template/package.json
+++ b/integration/helpers/vite-cloudflare-template/package.json
@@ -11,9 +11,9 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/cloudflare": "2.9.1-pre.1",
-    "@remix-run/cloudflare-pages": "2.9.1-pre.1",
-    "@remix-run/react": "2.9.1-pre.1",
+    "@remix-run/cloudflare": "2.9.1",
+    "@remix-run/cloudflare-pages": "2.9.1",
+    "@remix-run/react": "2.9.1",
     "isbot": "^4.1.0",
     "miniflare": "^3.20231030.4",
     "react": "^18.2.0",
diff --git a/packages/create-remix/CHANGELOG.md b/packages/create-remix/CHANGELOG.md
index 41b221c512c..8dd0204ca6c 100644
--- a/packages/create-remix/CHANGELOG.md
+++ b/packages/create-remix/CHANGELOG.md
@@ -1,8 +1,8 @@
 # `create-remix`
 
-## 2.9.1-pre.1
+## 2.9.1
 
-## 2.9.1-pre.0
+No significant changes to this package were made in this release. [See the repo `CHANGELOG.md`](https://github.com/remix-run/remix/blob/main/CHANGELOG.md) for an overview of all changes in v2.9.1.
 
 ## 2.9.0
 
diff --git a/packages/create-remix/package.json b/packages/create-remix/package.json
index c101e0df3b6..7c0cae79fde 100644
--- a/packages/create-remix/package.json
+++ b/packages/create-remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-remix",
-  "version": "2.9.1-pre.1",
+  "version": "2.9.1",
   "description": "Create a new Remix app",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix-architect/CHANGELOG.md b/packages/remix-architect/CHANGELOG.md
index c953fc14dd7..9dac06ff2c0 100644
--- a/packages/remix-architect/CHANGELOG.md
+++ b/packages/remix-architect/CHANGELOG.md
@@ -1,18 +1,11 @@
 # `@remix-run/architect`
 
-## 2.9.1-pre.1
+## 2.9.1
 
 ### Patch Changes
 
 - Updated dependencies:
-  - `@remix-run/node@2.9.1-pre.1`
-
-## 2.9.1-pre.0
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/node@2.9.1-pre.0`
+  - `@remix-run/node@2.9.1`
 
 ## 2.9.0
 
diff --git a/packages/remix-architect/package.json b/packages/remix-architect/package.json
index 958a2259395..24f23388090 100644
--- a/packages/remix-architect/package.json
+++ b/packages/remix-architect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/architect",
-  "version": "2.9.1-pre.1",
+  "version": "2.9.1",
   "description": "Architect server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare-pages/CHANGELOG.md b/packages/remix-cloudflare-pages/CHANGELOG.md
index 14a242e57bc..ccde1c18d92 100644
--- a/packages/remix-cloudflare-pages/CHANGELOG.md
+++ b/packages/remix-cloudflare-pages/CHANGELOG.md
@@ -1,18 +1,11 @@
 # `@remix-run/cloudflare-pages`
 
-## 2.9.1-pre.1
+## 2.9.1
 
 ### Patch Changes
 
 - Updated dependencies:
-  - `@remix-run/cloudflare@2.9.1-pre.1`
-
-## 2.9.1-pre.0
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/cloudflare@2.9.1-pre.0`
+  - `@remix-run/cloudflare@2.9.1`
 
 ## 2.9.0
 
diff --git a/packages/remix-cloudflare-pages/package.json b/packages/remix-cloudflare-pages/package.json
index 0060814a029..37023236e5a 100644
--- a/packages/remix-cloudflare-pages/package.json
+++ b/packages/remix-cloudflare-pages/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-pages",
-  "version": "2.9.1-pre.1",
+  "version": "2.9.1",
   "description": "Cloudflare Pages request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare-workers/CHANGELOG.md b/packages/remix-cloudflare-workers/CHANGELOG.md
index 341e1642cfb..6e7ba944325 100644
--- a/packages/remix-cloudflare-workers/CHANGELOG.md
+++ b/packages/remix-cloudflare-workers/CHANGELOG.md
@@ -1,18 +1,11 @@
 # `@remix-run/cloudflare-workers`
 
-## 2.9.1-pre.1
+## 2.9.1
 
 ### Patch Changes
 
 - Updated dependencies:
-  - `@remix-run/cloudflare@2.9.1-pre.1`
-
-## 2.9.1-pre.0
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/cloudflare@2.9.1-pre.0`
+  - `@remix-run/cloudflare@2.9.1`
 
 ## 2.9.0
 
diff --git a/packages/remix-cloudflare-workers/package.json b/packages/remix-cloudflare-workers/package.json
index 4ab542ca056..305ea7f59b1 100644
--- a/packages/remix-cloudflare-workers/package.json
+++ b/packages/remix-cloudflare-workers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-workers",
-  "version": "2.9.1-pre.1",
+  "version": "2.9.1",
   "description": "Cloudflare worker request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-cloudflare/CHANGELOG.md b/packages/remix-cloudflare/CHANGELOG.md
index ac31927ed6a..dd87e966ce8 100644
--- a/packages/remix-cloudflare/CHANGELOG.md
+++ b/packages/remix-cloudflare/CHANGELOG.md
@@ -1,18 +1,11 @@
 # `@remix-run/cloudflare`
 
-## 2.9.1-pre.1
+## 2.9.1
 
 ### Patch Changes
 
 - Updated dependencies:
-  - `@remix-run/server-runtime@2.9.1-pre.1`
-
-## 2.9.1-pre.0
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.1-pre.0`
+  - `@remix-run/server-runtime@2.9.1`
 
 ## 2.9.0
 
diff --git a/packages/remix-cloudflare/package.json b/packages/remix-cloudflare/package.json
index 92cd03a80aa..c967e94e098 100644
--- a/packages/remix-cloudflare/package.json
+++ b/packages/remix-cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare",
-  "version": "2.9.1-pre.1",
+  "version": "2.9.1",
   "description": "Cloudflare platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-css-bundle/CHANGELOG.md b/packages/remix-css-bundle/CHANGELOG.md
index 8ae836868b9..a76c5fa9b58 100644
--- a/packages/remix-css-bundle/CHANGELOG.md
+++ b/packages/remix-css-bundle/CHANGELOG.md
@@ -1,8 +1,8 @@
 # @remix-run/css-bundle
 
-## 2.9.1-pre.1
+## 2.9.1
 
-## 2.9.1-pre.0
+No significant changes to this package were made in this release. [See the repo `CHANGELOG.md`](https://github.com/remix-run/remix/blob/main/CHANGELOG.md) for an overview of all changes in v2.9.1.
 
 ## 2.9.0
 
diff --git a/packages/remix-css-bundle/package.json b/packages/remix-css-bundle/package.json
index 6837824d288..ed833f6416c 100644
--- a/packages/remix-css-bundle/package.json
+++ b/packages/remix-css-bundle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/css-bundle",
-  "version": "2.9.1-pre.1",
+  "version": "2.9.1",
   "description": "CSS bundle href when using CSS bundling features in Remix",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix-deno/CHANGELOG.md b/packages/remix-deno/CHANGELOG.md
index 6c49406708b..7a8d8c53755 100644
--- a/packages/remix-deno/CHANGELOG.md
+++ b/packages/remix-deno/CHANGELOG.md
@@ -1,18 +1,11 @@
 # `@remix-run/deno`
 
-## 2.9.1-pre.1
+## 2.9.1
 
 ### Patch Changes
 
 - Updated dependencies:
-  - `@remix-run/server-runtime@2.9.1-pre.1`
-
-## 2.9.1-pre.0
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.1-pre.0`
+  - `@remix-run/server-runtime@2.9.1`
 
 ## 2.9.0
 
diff --git a/packages/remix-deno/package.json b/packages/remix-deno/package.json
index f881cc4b843..19840b2c12e 100644
--- a/packages/remix-deno/package.json
+++ b/packages/remix-deno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/deno",
-  "version": "2.9.1-pre.1",
+  "version": "2.9.1",
   "description": "Deno platform abstractions for Remix",
   "homepage": "https://remix.run",
   "main": "./index.ts",
diff --git a/packages/remix-dev/CHANGELOG.md b/packages/remix-dev/CHANGELOG.md
index f075638b079..9ed9f62422a 100644
--- a/packages/remix-dev/CHANGELOG.md
+++ b/packages/remix-dev/CHANGELOG.md
@@ -1,23 +1,13 @@
 # `@remix-run/dev`
 
-## 2.9.1-pre.1
+## 2.9.1
 
 ### Patch Changes
 
-- Fix issue where consumers who had added Remix packages to Vite's `ssr.noExternal` option were being overridden by the Remix Vite plugin adding Remix packages to Vite's `ssr.external` option. ([#9301](https://github.com/remix-run/remix/pull/9301))
+- Fix issue where consumers who had added Remix packages to Vite's `ssr.noExternal` option were being overridden by the Remix Vite plugin adding Remix packages to Vite's `ssr.external` option ([#9301](https://github.com/remix-run/remix/pull/9301))
 - Updated dependencies:
-  - `@remix-run/node@2.9.1-pre.1`
-  - `@remix-run/server-runtime@2.9.1-pre.1`
-
-## 2.9.1-pre.0
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/react@2.9.1-pre.0`
-  - `@remix-run/node@2.9.1-pre.0`
-  - `@remix-run/serve@2.9.1-pre.0`
-  - `@remix-run/server-runtime@2.9.1-pre.0`
+  - `@remix-run/node@2.9.1`
+  - `@remix-run/server-runtime@2.9.1`
 
 ## 2.9.0
 
diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json
index 3f04fb59501..66769100e6c 100644
--- a/packages/remix-dev/package.json
+++ b/packages/remix-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/dev",
-  "version": "2.9.1-pre.1",
+  "version": "2.9.1",
   "description": "Dev tools and CLI for Remix",
   "homepage": "https://remix.run",
   "bugs": {
@@ -106,8 +106,8 @@
     "wrangler": "^3.28.2"
   },
   "peerDependencies": {
-    "@remix-run/react": "^2.9.1-pre.1",
-    "@remix-run/serve": "^2.9.1-pre.1",
+    "@remix-run/react": "^2.9.1",
+    "@remix-run/serve": "^2.9.1",
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2"
diff --git a/packages/remix-eslint-config/CHANGELOG.md b/packages/remix-eslint-config/CHANGELOG.md
index 96c652c2048..d2e5594a507 100644
--- a/packages/remix-eslint-config/CHANGELOG.md
+++ b/packages/remix-eslint-config/CHANGELOG.md
@@ -1,8 +1,8 @@
 # `@remix-run/eslint-config`
 
-## 2.9.1-pre.1
+## 2.9.1
 
-## 2.9.1-pre.0
+No significant changes to this package were made in this release. [See the repo `CHANGELOG.md`](https://github.com/remix-run/remix/blob/main/CHANGELOG.md) for an overview of all changes in v2.9.1.
 
 ## 2.9.0
 
diff --git a/packages/remix-eslint-config/package.json b/packages/remix-eslint-config/package.json
index 682f24f0e6b..79fafde9b84 100644
--- a/packages/remix-eslint-config/package.json
+++ b/packages/remix-eslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/eslint-config",
-  "version": "2.9.1-pre.1",
+  "version": "2.9.1",
   "description": "ESLint configuration for Remix projects",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-express/CHANGELOG.md b/packages/remix-express/CHANGELOG.md
index 95bb369e69d..2f06517efbc 100644
--- a/packages/remix-express/CHANGELOG.md
+++ b/packages/remix-express/CHANGELOG.md
@@ -1,18 +1,11 @@
 # `@remix-run/express`
 
-## 2.9.1-pre.1
+## 2.9.1
 
 ### Patch Changes
 
 - Updated dependencies:
-  - `@remix-run/node@2.9.1-pre.1`
-
-## 2.9.1-pre.0
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/node@2.9.1-pre.0`
+  - `@remix-run/node@2.9.1`
 
 ## 2.9.0
 
diff --git a/packages/remix-express/package.json b/packages/remix-express/package.json
index 435d7c21fb3..8a8b7125860 100644
--- a/packages/remix-express/package.json
+++ b/packages/remix-express/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/express",
-  "version": "2.9.1-pre.1",
+  "version": "2.9.1",
   "description": "Express server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-node/CHANGELOG.md b/packages/remix-node/CHANGELOG.md
index a04ad347f1f..a01548ddc8f 100644
--- a/packages/remix-node/CHANGELOG.md
+++ b/packages/remix-node/CHANGELOG.md
@@ -1,18 +1,11 @@
 # `@remix-run/node`
 
-## 2.9.1-pre.1
+## 2.9.1
 
 ### Patch Changes
 
 - Updated dependencies:
-  - `@remix-run/server-runtime@2.9.1-pre.1`
-
-## 2.9.1-pre.0
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.1-pre.0`
+  - `@remix-run/server-runtime@2.9.1`
 
 ## 2.9.0
 
diff --git a/packages/remix-node/package.json b/packages/remix-node/package.json
index 5187c104801..ba76af6f13d 100644
--- a/packages/remix-node/package.json
+++ b/packages/remix-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/node",
-  "version": "2.9.1-pre.1",
+  "version": "2.9.1",
   "description": "Node.js platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-react/CHANGELOG.md b/packages/remix-react/CHANGELOG.md
index 71c5c259e57..1e812ee0b2f 100644
--- a/packages/remix-react/CHANGELOG.md
+++ b/packages/remix-react/CHANGELOG.md
@@ -1,19 +1,12 @@
 # `@remix-run/react`
 
-## 2.9.1-pre.1
+## 2.9.1
 
 ### Patch Changes
 
+- Ignore `future/*.d.ts` files from TS build ([#9299](https://github.com/remix-run/remix/pull/9299))
 - Updated dependencies:
-  - `@remix-run/server-runtime@2.9.1-pre.1`
-
-## 2.9.1-pre.0
-
-### Patch Changes
-
-- Ignore future/\*.d.ts files from TS build ([#9299](https://github.com/remix-run/remix/pull/9299))
-- Updated dependencies:
-  - `@remix-run/server-runtime@2.9.1-pre.0`
+  - `@remix-run/server-runtime@2.9.1`
 
 ## 2.9.0
 
diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json
index 71cf3cbe40d..08f6e8179f7 100644
--- a/packages/remix-react/package.json
+++ b/packages/remix-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/react",
-  "version": "2.9.1-pre.1",
+  "version": "2.9.1",
   "description": "React DOM bindings for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-serve/CHANGELOG.md b/packages/remix-serve/CHANGELOG.md
index 25a36bbfe65..bf940df3011 100644
--- a/packages/remix-serve/CHANGELOG.md
+++ b/packages/remix-serve/CHANGELOG.md
@@ -1,20 +1,12 @@
 # `@remix-run/serve`
 
-## 2.9.1-pre.1
+## 2.9.1
 
 ### Patch Changes
 
 - Updated dependencies:
-  - `@remix-run/express@2.9.1-pre.1`
-  - `@remix-run/node@2.9.1-pre.1`
-
-## 2.9.1-pre.0
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/express@2.9.1-pre.0`
-  - `@remix-run/node@2.9.1-pre.0`
+  - `@remix-run/express@2.9.1`
+  - `@remix-run/node@2.9.1`
 
 ## 2.9.0
 
diff --git a/packages/remix-serve/package.json b/packages/remix-serve/package.json
index c8dc034d4c0..eb0f6552880 100644
--- a/packages/remix-serve/package.json
+++ b/packages/remix-serve/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/serve",
-  "version": "2.9.1-pre.1",
+  "version": "2.9.1",
   "description": "Production application server for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-server-runtime/CHANGELOG.md b/packages/remix-server-runtime/CHANGELOG.md
index 66f77029682..f4fe9aec95d 100644
--- a/packages/remix-server-runtime/CHANGELOG.md
+++ b/packages/remix-server-runtime/CHANGELOG.md
@@ -1,8 +1,8 @@
 # `@remix-run/server-runtime`
 
-## 2.9.1-pre.1
+## 2.9.1
 
-## 2.9.1-pre.0
+No significant changes to this package were made in this release. [See the repo `CHANGELOG.md`](https://github.com/remix-run/remix/blob/main/CHANGELOG.md) for an overview of all changes in v2.9.1.
 
 ## 2.9.0
 
diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json
index fd2efb08028..55ec3e4c4f2 100644
--- a/packages/remix-server-runtime/package.json
+++ b/packages/remix-server-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/server-runtime",
-  "version": "2.9.1-pre.1",
+  "version": "2.9.1",
   "description": "Server runtime for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
diff --git a/packages/remix-testing/CHANGELOG.md b/packages/remix-testing/CHANGELOG.md
index 448f188f87b..56f7654c7fd 100644
--- a/packages/remix-testing/CHANGELOG.md
+++ b/packages/remix-testing/CHANGELOG.md
@@ -1,20 +1,12 @@
 # `@remix-run/testing`
 
-## 2.9.1-pre.1
+## 2.9.1
 
 ### Patch Changes
 
 - Updated dependencies:
-  - `@remix-run/node@2.9.1-pre.1`
-  - `@remix-run/react@2.9.1-pre.1`
-
-## 2.9.1-pre.0
-
-### Patch Changes
-
-- Updated dependencies:
-  - `@remix-run/react@2.9.1-pre.0`
-  - `@remix-run/node@2.9.1-pre.0`
+  - `@remix-run/react@2.9.1`
+  - `@remix-run/node@2.9.1`
 
 ## 2.9.0
 
diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
index 9ec05e0be44..73a3f2c537f 100644
--- a/packages/remix-testing/package.json
+++ b/packages/remix-testing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/testing",
-  "version": "2.9.1-pre.1",
+  "version": "2.9.1",
   "description": "Testing utilities for Remix apps",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/packages/remix/package.json b/packages/remix/package.json
index f2e4f4d0012..ed9a0aec845 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "remix",
-  "version": "2.9.1-pre.1",
+  "version": "2.9.1",
   "description": "A framework for building better websites",
   "homepage": "https://remix.run",
   "bugs": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7a3cbb3400a..24d597d840b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -548,13 +548,13 @@ importers:
   integration/helpers/vite-cloudflare-template:
     dependencies:
       '@remix-run/cloudflare':
-        specifier: 2.9.1-pre.1
+        specifier: 2.9.1
         version: link:../../../packages/remix-cloudflare
       '@remix-run/cloudflare-pages':
-        specifier: 2.9.1-pre.1
+        specifier: 2.9.1
         version: link:../../../packages/remix-cloudflare-pages
       '@remix-run/react':
-        specifier: 2.9.1-pre.1
+        specifier: 2.9.1
         version: link:../../../packages/remix-react
       isbot:
         specifier: ^4.1.0
@@ -868,7 +868,7 @@ importers:
         specifier: workspace:*
         version: link:../remix-node
       '@remix-run/react':
-        specifier: ^2.9.1-pre.1
+        specifier: ^2.9.1
         version: link:../remix-react
       '@remix-run/router':
         specifier: 1.16.0

From 5f144d56b5893b5ae5764452b8bc09dddf167e23 Mon Sep 17 00:00:00 2001
From: Mark Dalgleish <mark.john.dalgleish@gmail.com>
Date: Fri, 26 Apr 2024 07:50:35 +1000
Subject: [PATCH 096/108] Fix `dest already exists` error during Vite build
 (#9305)

---
 .changeset/five-planets-grin.md   | 5 +++++
 packages/remix-dev/vite/plugin.ts | 9 +++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/five-planets-grin.md

diff --git a/.changeset/five-planets-grin.md b/.changeset/five-planets-grin.md
new file mode 100644
index 00000000000..d0657c90525
--- /dev/null
+++ b/.changeset/five-planets-grin.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/dev": patch
+---
+
+Fix `dest already exists` error when running `remix vite:build`
diff --git a/packages/remix-dev/vite/plugin.ts b/packages/remix-dev/vite/plugin.ts
index 927322d97c0..ef3a54b4758 100644
--- a/packages/remix-dev/vite/plugin.ts
+++ b/packages/remix-dev/vite/plugin.ts
@@ -830,6 +830,11 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
     return JSON.parse(manifestContents) as Vite.Manifest;
   };
 
+  let getViteManifestFilePaths = (viteManifest: Vite.Manifest): Set<string> => {
+    let filePaths = Object.values(viteManifest).map((chunk) => chunk.file);
+    return new Set(filePaths);
+  };
+
   let getViteManifestAssetPaths = (
     viteManifest: Vite.Manifest
   ): Set<string> => {
@@ -1401,7 +1406,7 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
           let ssrViteManifest = await loadViteManifest(serverBuildDirectory);
           let clientViteManifest = await loadViteManifest(clientBuildDirectory);
 
-          let clientAssetPaths = getViteManifestAssetPaths(clientViteManifest);
+          let clientFilePaths = getViteManifestFilePaths(clientViteManifest);
           let ssrAssetPaths = getViteManifestAssetPaths(ssrViteManifest);
 
           // We only move assets that aren't in the client build, otherwise we
@@ -1413,7 +1418,7 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
           let movedAssetPaths: string[] = [];
           for (let ssrAssetPath of ssrAssetPaths) {
             let src = path.join(serverBuildDirectory, ssrAssetPath);
-            if (!clientAssetPaths.has(ssrAssetPath)) {
+            if (!clientFilePaths.has(ssrAssetPath)) {
               let dest = path.join(clientBuildDirectory, ssrAssetPath);
               await fse.move(src, dest);
               movedAssetPaths.push(dest);

From a171049f2e9d3d0355fb4fc3467f8aacea043cc9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 26 Apr 2024 13:17:43 +0000
Subject: [PATCH 097/108] chore: deduplicate pnpm-lock.yaml

---
 pnpm-lock.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 24d597d840b..42cf379d7d2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13990,6 +13990,7 @@ packages:
   /superagent@8.1.2:
     resolution: {integrity: sha512-6WTxW1EB6yCxV5VFOIPQruWGHqc3yI7hEmZK6h+pyk69Lk/Ut7rLUY6W/ONF2MjBuGjvmMiIpsrVJ2vjrHlslA==}
     engines: {node: '>=6.4.0 <13 || >=14'}
+    deprecated: Please upgrade to v9.0.0+ as we have fixed a public vulnerability with formidable dependency. Note that v9.0.0+ requires Node.js v14.18.0+. See https://github.com/ladjs/superagent/pull/1800 for insight. This project is supported and maintained by the team at Forward Email @ https://forwardemail.net
     dependencies:
       component-emitter: 1.3.0
       cookiejar: 2.1.4

From 75321d3e19a62268b4efc5bc1ade0b7e53bcb390 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Mon, 29 Apr 2024 09:20:06 -0400
Subject: [PATCH 098/108] Add undefined to useActionData type override (#9322)

---
 .changeset/happy-ladybugs-smoke.md            | 5 +++++
 packages/remix-react/future/single-fetch.d.ts | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/happy-ladybugs-smoke.md

diff --git a/.changeset/happy-ladybugs-smoke.md b/.changeset/happy-ladybugs-smoke.md
new file mode 100644
index 00000000000..2d8f4ca7bef
--- /dev/null
+++ b/.changeset/happy-ladybugs-smoke.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/react": patch
+---
+
+Add `undefined` to `useActionData` type override
diff --git a/packages/remix-react/future/single-fetch.d.ts b/packages/remix-react/future/single-fetch.d.ts
index 5356fcb7be6..ddef3d7098c 100644
--- a/packages/remix-react/future/single-fetch.d.ts
+++ b/packages/remix-react/future/single-fetch.d.ts
@@ -1,4 +1,4 @@
-import type { MetaArgs, UNSAFE_MetaMatch } from "@remix-run/react";
+import type { MetaArgs, UIMatch, UNSAFE_MetaMatch } from "@remix-run/react";
 import type {
   LoaderFunctionArgs,
   ActionFunctionArgs,
@@ -57,7 +57,7 @@ declare module "@remix-run/react" {
     : never;
 
   export function useActionData<T>(): T extends ActionFunction_SingleFetch
-    ? SingleFetchSerialize_V2<T>
+    ? SingleFetchSerialize_V2<T> | undefined
     : never;
 
   export function useRouteLoaderData<T>(

From 09e81a8e4c8dd6ad303b88037e02b0209d848f5e Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Wed, 1 May 2024 14:55:10 -0400
Subject: [PATCH 099/108] Resource Route Single Fetch Updates (#9349)

---
 .changeset/rich-spoons-draw.md                |   5 +
 .changeset/slow-peaches-matter.md             |   5 +
 docs/guides/single-fetch.md                   |  70 ++++++++
 integration/package.json                      |   2 +-
 integration/single-fetch-test.ts              | 167 ++++++++++++++++++
 packages/remix-dev/package.json               |   2 +-
 packages/remix-react/package.json             |   6 +-
 packages/remix-server-runtime/deprecations.ts |  13 ++
 packages/remix-server-runtime/package.json    |   2 +-
 packages/remix-server-runtime/server.ts       |  43 +++++
 packages/remix-server-runtime/single-fetch.ts |  31 +++-
 packages/remix-testing/package.json           |   4 +-
 pnpm-lock.yaml                                |  50 +++---
 13 files changed, 365 insertions(+), 35 deletions(-)
 create mode 100644 .changeset/rich-spoons-draw.md
 create mode 100644 .changeset/slow-peaches-matter.md
 create mode 100644 packages/remix-server-runtime/deprecations.ts

diff --git a/.changeset/rich-spoons-draw.md b/.changeset/rich-spoons-draw.md
new file mode 100644
index 00000000000..dc44bcf0d71
--- /dev/null
+++ b/.changeset/rich-spoons-draw.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/server-runtime": patch
+---
+
+Automatically wrap resource route naked object returns in `json()` for back-compat in v2 (and log deprecation warning)
diff --git a/.changeset/slow-peaches-matter.md b/.changeset/slow-peaches-matter.md
new file mode 100644
index 00000000000..4319d7d95e1
--- /dev/null
+++ b/.changeset/slow-peaches-matter.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/server-runtime": patch
+---
+
+Pass `response` stub to resource route handlerså when single fetch is enabled
diff --git a/docs/guides/single-fetch.md b/docs/guides/single-fetch.md
index 1c0f5048555..810ec3c7f74 100644
--- a/docs/guides/single-fetch.md
+++ b/docs/guides/single-fetch.md
@@ -270,6 +270,74 @@ And then when `c` calls `serverLoader`, it'll make it's own call for just the `c
 GET /a/b/c.data?_routes=routes/c
 ```
 
+### Resource Routes
+
+Because of the new streaming format used by Single Fetch, raw JavaScript objects returned from `loader` and `action` functions are no longer automatically converted to `Response` instances via the `json()` utility. Instead, in normal navigational data loads they're combined with the other loader data and streamed down in a `turbo-stream` response. Resource routes are unique because they're intended to be hit individually -- and not always via Remix client side code. They can also be accessed via any other HTTP client (`fetch`, `cURL`, etc.).
+
+With Single Fetch enabled, raw Javascript objects returned from resource routes will be handled as follows:
+
+When accessing from a Remix API such as `useFetcher`, raw Javascript objects will be returned as turbo-stream responses, just like normal loaders and actions (this is because `useFetcher` will append the `.data` suffix to the request).
+
+When accessing from an external tool such as `fetch` or `cURL`, we will continue this automatic conversion to `json()` or backwards-compatibility in v2:
+
+- When we detect a raw object for an external request in v2, we will will log a deprecation warning and wrap the value in `json()` for easier opt-into the Single Fetch feature
+- At your convenience, you can add the `json()` call to your resource route handlers to stop returning raw objects when you want a JSON response for external consumption
+- Once you've addressed all of the deprecation warnings in your application's resource routes, you will be better prepared for the eventual Remix v3 upgrade
+
+```tsx filename=app/routes/resource.tsx bad
+export function loader() {
+  return {
+    message: "My externally-accessed resource route",
+  };
+}
+```
+
+```tsx filename=app/routes/resource.tsx good
+import { json } from "@remix-run/react";
+
+export function loader() {
+  return json({
+    message: "My externally-accessed resource route",
+  });
+}
+```
+
+#### Response Stub and Resource Routes
+
+Ad discussed above, the `headers` export is deprecated in favor of a new [`response` stub][responsestub] passed to your `loader` and `action` functions. This is somewhat confusing in resource routes, though, because you get to return the _actual_ `Response` - there's no real need for a "stub" concept because there's no merging results from multiple loaders into a single Response:
+
+```tsx filename=routes/resource.tsx
+// Using your own Response is the most straightforward approach
+export async function loader() {
+  const data = await getData();
+  return json(data, {
+    status: 200,
+    headers: {
+      "X-Custom": "whatever",
+    },
+  });
+}
+```
+
+To keep things consistent, resource route `loader`/`action` functions will still receive a `response` stub and you can use it if you need to (maybe to share code amongst non-resource-route handlers):
+
+```tsx filename=routes/resource.tsx
+// But you can still set values on the response stubstraightforward approach
+export async function loader({
+  response,
+}: LoaderFunctionArgs) {
+  const data = await getData();
+  response.status = 200;
+  response.headers.set("X-Custom", "whatever");
+  return json(data);
+}
+```
+
+It's best to try to avoid using the `response` stub _and also_ returning a `Response` with custom status/headers, but if you do, the following logic will apply":
+
+- The `Response` instance status will take priority over any `response` stub status
+- Headers operations on the `response` stub `headers` will be re-played on the returned `Response` headers instance
+
 [future-flags]: ../file-conventions/remix-config#future
 [should-revalidate]: ../route/should-revalidate
 [entry-server]: ../file-conventions/entry.server
@@ -284,3 +352,5 @@ GET /a/b/c.data?_routes=routes/c
 [starttransition]: https://react.dev/reference/react/startTransition
 [headers]: ../route/headers
 [mdn-headers]: https://developer.mozilla.org/en-US/docs/Web/API/Headers
+[resource-routes]: ../guides/resource-routes
+[responsestub]: #headers
diff --git a/integration/package.json b/integration/package.json
index 3e59031d9f9..f3b75892825 100644
--- a/integration/package.json
+++ b/integration/package.json
@@ -14,7 +14,7 @@
     "@remix-run/dev": "workspace:*",
     "@remix-run/express": "workspace:*",
     "@remix-run/node": "workspace:*",
-    "@remix-run/router": "1.16.0",
+    "@remix-run/router": "1.16.1-pre.0",
     "@remix-run/server-runtime": "workspace:*",
     "@types/express": "^4.17.9",
     "@vanilla-extract/css": "^1.10.0",
diff --git a/integration/single-fetch-test.ts b/integration/single-fetch-test.ts
index c571d63f46e..7b1abd76f95 100644
--- a/integration/single-fetch-test.ts
+++ b/integration/single-fetch-test.ts
@@ -1500,6 +1500,173 @@ test.describe("single-fetch", () => {
     expect(await app.getHtml("#target")).toContain("Target");
   });
 
+  test("wraps resource route naked object returns in json with a deprecation warning", async () => {
+    let oldConsoleWarn = console.warn;
+    let warnLogs: unknown[] = [];
+    console.warn = (...args) => warnLogs.push(...args);
+
+    let fixture = await createFixture(
+      {
+        config: {
+          future: {
+            unstable_singleFetch: true,
+          },
+        },
+        files: {
+          ...files,
+          "app/routes/resource.tsx": js`
+            export function loader() {
+              return { message: "RESOURCE" };
+            }
+          `,
+        },
+      },
+      ServerMode.Development
+    );
+    let res = await fixture.requestResource("/resource");
+    expect(await res.json()).toEqual({
+      message: "RESOURCE",
+    });
+
+    expect(warnLogs).toEqual([
+      "⚠️ REMIX FUTURE CHANGE: Resource routes will no longer be able to return " +
+        "raw JavaScript objects in v3 when Single Fetch becomes the default. You " +
+        "can prepare for this change at your convenience by wrapping the data " +
+        "returned from your `loader` function in the `routes/resource` route with " +
+        "`json()`.  For instructions on making this change see " +
+        "https://remix.run/docs/en/v2.9.2/guides/single-fetch#resource-routes",
+    ]);
+    console.warn = oldConsoleWarn;
+  });
+
+  test("processes response stub onto resource routes returning raw data", async () => {
+    let fixture = await createFixture(
+      {
+        config: {
+          future: {
+            unstable_singleFetch: true,
+          },
+        },
+        files: {
+          ...files,
+          "app/routes/resource.tsx": js`
+            import { json } from '@remix-run/node';
+
+            export function loader({ response }) {
+              // When raw json is returned, the stub status/headers will just be used directly
+              response.status = 201;
+              response.headers.set('X-Stub', 'yes')
+              return { message: "RESOURCE" };
+            }
+          `,
+        },
+      },
+      ServerMode.Development
+    );
+    let res = await fixture.requestResource("/resource");
+    expect(res.status).toBe(201);
+    expect(res.headers.get("X-Stub")).toBe("yes");
+    expect(await res.json()).toEqual({
+      message: "RESOURCE",
+    });
+  });
+
+  test("processes response stub onto resource routes returning responses", async () => {
+    let fixture = await createFixture(
+      {
+        config: {
+          future: {
+            unstable_singleFetch: true,
+          },
+        },
+        files: {
+          ...files,
+          "app/routes/resource.tsx": js`
+            import { json } from '@remix-run/node';
+
+            export function loader({ response }) {
+              // This will be ignored in favor of the returned Response status
+              response.status = 200;
+              response.headers.set('X-Stub', 'yes')
+              // This will overwrite the returned Response header
+              response.headers.set('X-Set', '2')
+              // This will append to the returned Response header
+              response.headers.append('X-Append', '2')
+              return json({ message: "RESOURCE" }, {
+                // This one takes precedence
+                status: 201,
+                headers: {
+                  'X-Response': 'yes',
+                  'X-Set': '1',
+                  'X-Append': '1',
+                },
+              });
+            }
+          `,
+        },
+      },
+      ServerMode.Development
+    );
+    let res = await fixture.requestResource("/resource");
+    expect(res.status).toBe(201);
+    expect(res.headers.get("X-Response")).toBe("yes");
+    expect(res.headers.get("X-Stub")).toBe("yes");
+    expect(res.headers.get("X-Set")).toBe("2");
+    expect(res.headers.get("X-Append")).toBe("1, 2");
+    expect(await res.json()).toEqual({
+      message: "RESOURCE",
+    });
+  });
+
+  test("allows fetcher to hit resource route and return via turbo stream", async ({
+    page,
+  }) => {
+    let fixture = await createFixture({
+      config: {
+        future: {
+          unstable_singleFetch: true,
+        },
+      },
+      files: {
+        ...files,
+        "app/routes/_index.tsx": js`
+          import { useFetcher } from "@remix-run/react";
+
+          export default function Component() {
+            let fetcher = useFetcher();
+            return (
+              <div>
+                <button id="load" onClick={() => fetcher.load('/resource')}>
+                  Load
+                </button>
+                {fetcher.data ? <pre id="fetcher-data">{fetcher.data.message} {fetcher.data.date.toISOString()}</pre> : null}
+              </div>
+            );
+          }
+        `,
+        "app/routes/resource.tsx": js`
+          export function loader() {
+            // Fetcher calls to resource routes will append ".data" and we'll go through
+            // the turbo-stream flow.  If a user were to curl this endpoint they'd go
+            // through "handleResourceRoute" and it would be returned as "json()"
+            return {
+              message: "RESOURCE",
+              date: new Date("${ISO_DATE}"),
+            };
+          }
+        `,
+      },
+    });
+    let appFixture = await createAppFixture(fixture);
+    let app = new PlaywrightFixture(appFixture, page);
+    await app.goto("/");
+    await app.clickElement("#load");
+    await page.waitForSelector("#fetcher-data");
+    expect(await app.getHtml("#fetcher-data")).toContain(
+      "RESOURCE 2024-03-12T12:00:00.000Z"
+    );
+  });
+
   test.describe("client loaders", () => {
     test("when no routes have client loaders", async ({ page }) => {
       let fixture = await createFixture(
diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json
index 66769100e6c..2b990a5a524 100644
--- a/packages/remix-dev/package.json
+++ b/packages/remix-dev/package.json
@@ -32,7 +32,7 @@
     "@mdx-js/mdx": "^2.3.0",
     "@npmcli/package-json": "^4.0.1",
     "@remix-run/node": "workspace:*",
-    "@remix-run/router": "1.16.0",
+    "@remix-run/router": "1.16.1-pre.0",
     "@remix-run/server-runtime": "workspace:*",
     "@types/mdx": "^2.0.5",
     "@vanilla-extract/integration": "^6.2.0",
diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json
index 08f6e8179f7..29675765c11 100644
--- a/packages/remix-react/package.json
+++ b/packages/remix-react/package.json
@@ -19,10 +19,10 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@remix-run/router": "1.16.0",
+    "@remix-run/router": "1.16.1-pre.0",
     "@remix-run/server-runtime": "workspace:*",
-    "react-router": "6.23.0",
-    "react-router-dom": "6.23.0",
+    "react-router": "6.23.1-pre.0",
+    "react-router-dom": "6.23.1-pre.0",
     "turbo-stream": "^2.0.0"
   },
   "devDependencies": {
diff --git a/packages/remix-server-runtime/deprecations.ts b/packages/remix-server-runtime/deprecations.ts
new file mode 100644
index 00000000000..d6c25769cf8
--- /dev/null
+++ b/packages/remix-server-runtime/deprecations.ts
@@ -0,0 +1,13 @@
+export function resourceRouteJsonWarning(
+  type: "loader" | "action",
+  routeId: string
+) {
+  return (
+    "⚠️ REMIX FUTURE CHANGE: Resource routes will no longer be able to " +
+    "return raw JavaScript objects in v3 when Single Fetch becomes the default. " +
+    "You can prepare for this change at your convenience by wrapping the data " +
+    `returned from your \`${type}\` function in the \`${routeId}\` route with ` +
+    "`json()`.  For instructions on making this change see " +
+    "https://remix.run/docs/en/v2.9.2/guides/single-fetch#resource-routes"
+  );
+}
diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json
index 55ec3e4c4f2..d2afcdd090c 100644
--- a/packages/remix-server-runtime/package.json
+++ b/packages/remix-server-runtime/package.json
@@ -19,7 +19,7 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@remix-run/router": "1.16.0",
+    "@remix-run/router": "1.16.1-pre.0",
     "@types/cookie": "^0.6.0",
     "@web3-storage/multipart-parser": "^1.0.0",
     "cookie": "^0.6.0",
diff --git a/packages/remix-server-runtime/server.ts b/packages/remix-server-runtime/server.ts
index 269f56551cb..11305551c9c 100644
--- a/packages/remix-server-runtime/server.ts
+++ b/packages/remix-server-runtime/server.ts
@@ -29,6 +29,7 @@ import {
   isRedirectResponse,
   isRedirectStatusCode,
   isResponse,
+  json,
 } from "./responses";
 import { createServerHandoffString } from "./serverHandoff";
 import { getDevServerHooks } from "./dev";
@@ -38,11 +39,14 @@ import {
   getResponseStubs,
   getSingleFetchDataStrategy,
   getSingleFetchRedirect,
+  getSingleFetchResourceRouteDataStrategy,
   mergeResponseStubs,
   singleFetchAction,
   singleFetchLoaders,
   SingleFetchRedirectSymbol,
 } from "./single-fetch";
+import { resourceRouteJsonWarning } from "./deprecations";
+import { ResponseStubOperationsSymbol } from "./routeModules";
 
 export type RequestHandler = (
   request: Request,
@@ -226,6 +230,7 @@ export const createRequestHandler: CreateRequestHandlerFunction = (
     ) {
       response = await handleResourceRequest(
         serverMode,
+        _build,
         staticHandler,
         matches.slice(-1)[0].route.id,
         request,
@@ -559,6 +564,7 @@ async function handleDocumentRequest(
 
 async function handleResourceRequest(
   serverMode: ServerMode,
+  build: ServerBuild,
   staticHandler: StaticHandler,
   routeId: string,
   request: Request,
@@ -566,13 +572,24 @@ async function handleResourceRequest(
   handleError: (err: unknown) => void
 ) {
   try {
+    let responseStubs = build.future.unstable_singleFetch
+      ? getResponseStubs()
+      : {};
     // Note we keep the routeId here to align with the Remix handling of
     // resource routes which doesn't take ?index into account and just takes
     // the leaf match
     let response = await staticHandler.queryRoute(request, {
       routeId,
       requestContext: loadContext,
+      ...(build.future.unstable_singleFetch
+        ? {
+            unstable_dataStrategy: getSingleFetchResourceRouteDataStrategy({
+              responseStubs,
+            }),
+          }
+        : null),
     });
+
     if (typeof response === "object") {
       invariant(
         !(DEFERRED_SYMBOL in response),
@@ -580,6 +597,32 @@ async function handleResourceRequest(
           `forget to export a default UI component from the "${routeId}" route?`
       );
     }
+
+    if (build.future.unstable_singleFetch) {
+      let stub = responseStubs[routeId];
+      if (isResponse(response)) {
+        // If a response was returned, we use it's status and we merge our
+        // response stub headers onto it
+        let ops = stub[ResponseStubOperationsSymbol];
+        for (let [op, ...args] of ops) {
+          // @ts-expect-error
+          response.headers[op](...args);
+        }
+      } else {
+        console.warn(
+          resourceRouteJsonWarning(
+            request.method === "GET" ? "loader" : "action",
+            routeId
+          )
+        );
+        // Otherwise we create a json Response using the stub
+        response = json(response, {
+          status: stub.status,
+          headers: stub.headers,
+        });
+      }
+    }
+
     // callRouteLoader/callRouteAction always return responses (w/o single fetch).
     // With single fetch, users should always be Responses from resource routes
     invariant(
diff --git a/packages/remix-server-runtime/single-fetch.ts b/packages/remix-server-runtime/single-fetch.ts
index 8d9d358241a..bdfe745f7fc 100644
--- a/packages/remix-server-runtime/single-fetch.ts
+++ b/packages/remix-server-runtime/single-fetch.ts
@@ -1,6 +1,7 @@
 import type {
   StaticHandler,
   unstable_DataStrategyFunctionArgs as DataStrategyFunctionArgs,
+  unstable_DataStrategyFunction as DataStrategyFunction,
   StaticHandlerContext,
 } from "@remix-run/router";
 import {
@@ -49,7 +50,7 @@ export function getSingleFetchDataStrategy(
     isActionDataRequest,
     loadRouteIds,
   }: { isActionDataRequest?: boolean; loadRouteIds?: string[] } = {}
-) {
+): DataStrategyFunction {
   return async ({ request, matches }: DataStrategyFunctionArgs) => {
     // Don't call loaders on action data requests
     if (isActionDataRequest && request.method === "GET") {
@@ -102,6 +103,32 @@ export function getSingleFetchDataStrategy(
   };
 }
 
+export function getSingleFetchResourceRouteDataStrategy({
+  responseStubs,
+}: {
+  responseStubs: ReturnType<typeof getResponseStubs>;
+}): DataStrategyFunction {
+  return async ({ matches }: DataStrategyFunctionArgs) => {
+    let results = await Promise.all(
+      matches.map(async (match) => {
+        let responseStub = match.shouldLoad
+          ? responseStubs[match.route.id]
+          : null;
+        let result = await match.resolve(async (handler) => {
+          // Cast `ResponseStubImpl -> ResponseStub` to hide the symbol in userland
+          let ctx: DataStrategyCtx = {
+            response: responseStub as ResponseStub,
+          };
+          let data = await handler(ctx);
+          return { type: "data", result: data };
+        });
+        return result;
+      })
+    );
+    return results;
+  };
+}
+
 export async function singleFetchAction(
   serverMode: ServerMode,
   staticHandler: StaticHandler,
@@ -128,7 +155,7 @@ export async function singleFetchAction(
       }),
     });
 
-    // Unlike `handleDataRequest`, when singleFetch is enabled, queryRoute does
+    // Unlike `handleDataRequest`, when singleFetch is enabled, query does
     // let non-Response return values through
     if (isResponse(result)) {
       return {
diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
index 73a3f2c537f..ae5003135e5 100644
--- a/packages/remix-testing/package.json
+++ b/packages/remix-testing/package.json
@@ -21,8 +21,8 @@
   "dependencies": {
     "@remix-run/node": "workspace:*",
     "@remix-run/react": "workspace:*",
-    "@remix-run/router": "1.16.0",
-    "react-router-dom": "6.23.0"
+    "@remix-run/router": "1.16.1-pre.0",
+    "react-router-dom": "6.23.1-pre.0"
   },
   "devDependencies": {
     "@remix-run/server-runtime": "workspace:*",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 42cf379d7d2..34bdab5023c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -323,8 +323,8 @@ importers:
         specifier: workspace:*
         version: link:../packages/remix-node
       '@remix-run/router':
-        specifier: 1.16.0
-        version: 1.16.0
+        specifier: 1.16.1-pre.0
+        version: 1.16.1-pre.0
       '@remix-run/server-runtime':
         specifier: workspace:*
         version: link:../packages/remix-server-runtime
@@ -871,8 +871,8 @@ importers:
         specifier: ^2.9.1
         version: link:../remix-react
       '@remix-run/router':
-        specifier: 1.16.0
-        version: 1.16.0
+        specifier: 1.16.1-pre.0
+        version: 1.16.1-pre.0
       '@remix-run/server-runtime':
         specifier: workspace:*
         version: link:../remix-server-runtime
@@ -1217,17 +1217,17 @@ importers:
   packages/remix-react:
     dependencies:
       '@remix-run/router':
-        specifier: 1.16.0
-        version: 1.16.0
+        specifier: 1.16.1-pre.0
+        version: 1.16.1-pre.0
       '@remix-run/server-runtime':
         specifier: workspace:*
         version: link:../remix-server-runtime
       react-router:
-        specifier: 6.23.0
-        version: 6.23.0(react@18.2.0)
+        specifier: 6.23.1-pre.0
+        version: 6.23.1-pre.0(react@18.2.0)
       react-router-dom:
-        specifier: 6.23.0
-        version: 6.23.0(react-dom@18.2.0)(react@18.2.0)
+        specifier: 6.23.1-pre.0
+        version: 6.23.1-pre.0(react-dom@18.2.0)(react@18.2.0)
       turbo-stream:
         specifier: ^2.0.0
         version: 2.0.0
@@ -1303,8 +1303,8 @@ importers:
   packages/remix-server-runtime:
     dependencies:
       '@remix-run/router':
-        specifier: 1.16.0
-        version: 1.16.0
+        specifier: 1.16.1-pre.0
+        version: 1.16.1-pre.0
       '@types/cookie':
         specifier: ^0.6.0
         version: 0.6.0
@@ -1340,11 +1340,11 @@ importers:
         specifier: workspace:*
         version: link:../remix-react
       '@remix-run/router':
-        specifier: 1.16.0
-        version: 1.16.0
+        specifier: 1.16.1-pre.0
+        version: 1.16.1-pre.0
       react-router-dom:
-        specifier: 6.23.0
-        version: 6.23.0(react-dom@18.2.0)(react@18.2.0)
+        specifier: 6.23.1-pre.0
+        version: 6.23.1-pre.0(react-dom@18.2.0)(react@18.2.0)
     devDependencies:
       '@remix-run/server-runtime':
         specifier: workspace:*
@@ -4199,8 +4199,8 @@ packages:
       - encoding
     dev: false
 
-  /@remix-run/router@1.16.0:
-    resolution: {integrity: sha512-Quz1KOffeEf/zwkCBM3kBtH4ZoZ+pT3xIXBG4PPW/XFtDP7EGhtTiC2+gpL9GnR7+Qdet5Oa6cYSvwKYg6kN9Q==}
+  /@remix-run/router@1.16.1-pre.0:
+    resolution: {integrity: sha512-RnLJQp2JRAQrMEu8a9SNKfzpOCdGjV/cHe6StKFb9iESRIlTdaaZdgqQo0TGXU1kjy2O4q42Cg2zVc+CnOM39g==}
     engines: {node: '>=14.0.0'}
     dev: false
 
@@ -12816,26 +12816,26 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: false
 
-  /react-router-dom@6.23.0(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-Q9YaSYvubwgbal2c9DJKfx6hTNoBp3iJDsl+Duva/DwxoJH+OTXkxGpql4iUK2sla/8z4RpjAm6EWx1qUDuopQ==}
+  /react-router-dom@6.23.1-pre.0(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-gXwu2McNyyuD+d2kC8TRqBGmfoYZO9sc7Egv8f/KQQc/wpPDdKOaq4BALX5oHwJZv142uSpfuE+bf8YsdGYFRg==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
       react: '>=16.8'
       react-dom: '>=16.8'
     dependencies:
-      '@remix-run/router': 1.16.0
+      '@remix-run/router': 1.16.1-pre.0
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      react-router: 6.23.0(react@18.2.0)
+      react-router: 6.23.1-pre.0(react@18.2.0)
     dev: false
 
-  /react-router@6.23.0(react@18.2.0):
-    resolution: {integrity: sha512-wPMZ8S2TuPadH0sF5irFGjkNLIcRvOSaEe7v+JER8508dyJumm6XZB1u5kztlX0RVq6AzRVndzqcUh6sFIauzA==}
+  /react-router@6.23.1-pre.0(react@18.2.0):
+    resolution: {integrity: sha512-bks0gSImPeGXVcfUVA/Xz210cuXci+3le+wCgIqIUy0EQaHrgy0desL7K8AvWom0yBkmBimIJ0kin36lkoI5RA==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
       react: '>=16.8'
     dependencies:
-      '@remix-run/router': 1.16.0
+      '@remix-run/router': 1.16.1-pre.0
       react: 18.2.0
     dev: false
 

From bc70adea717796fbdc28f3d3acb851108233d97c Mon Sep 17 00:00:00 2001
From: Andrew Haines <andrew@haines.org.nz>
Date: Thu, 2 May 2024 13:28:26 +0100
Subject: [PATCH 100/108] fix(ci): Update deno template path (#9357)

Signed-off-by: Andrew Haines <andrew@haines.org.nz>
---
 scripts/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/utils.js b/scripts/utils.js
index 21b9655b44c..6481fb9fa1d 100644
--- a/scripts/utils.js
+++ b/scripts/utils.js
@@ -203,7 +203,7 @@ async function incrementRemixVersion(nextVersion) {
   await Promise.all(
     [
       path.join(".vscode", "deno_resolve_npm_imports.json"),
-      path.join("templates", "deno", ".vscode", "resolve_npm_imports.json"),
+      path.join("templates", "classic-remix-compiler", "deno", ".vscode", "resolve_npm_imports.json"),
     ].map((importMapPath) =>
       updateDenoImportMap(path.join(rootDir, importMapPath), nextVersion)
     )

From 612f33e632b9f7025ba1bb232f75a1445b2b0c45 Mon Sep 17 00:00:00 2001
From: Remix Run Bot <hello@remix.run>
Date: Thu, 2 May 2024 12:30:08 +0000
Subject: [PATCH 101/108] chore: format

---
 scripts/utils.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/utils.js b/scripts/utils.js
index 6481fb9fa1d..109a51fa1f0 100644
--- a/scripts/utils.js
+++ b/scripts/utils.js
@@ -203,7 +203,13 @@ async function incrementRemixVersion(nextVersion) {
   await Promise.all(
     [
       path.join(".vscode", "deno_resolve_npm_imports.json"),
-      path.join("templates", "classic-remix-compiler", "deno", ".vscode", "resolve_npm_imports.json"),
+      path.join(
+        "templates",
+        "classic-remix-compiler",
+        "deno",
+        ".vscode",
+        "resolve_npm_imports.json"
+      ),
     ].map((importMapPath) =>
       updateDenoImportMap(path.join(rootDir, importMapPath), nextVersion)
     )

From bd6a30601107798d6771cf166417e2034691a9c4 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Thu, 2 May 2024 09:18:24 -0400
Subject: [PATCH 102/108] Update single fetch docs for resource routes

---
 docs/guides/single-fetch.md | 51 +++++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/docs/guides/single-fetch.md b/docs/guides/single-fetch.md
index 810ec3c7f74..24698c02a55 100644
--- a/docs/guides/single-fetch.md
+++ b/docs/guides/single-fetch.md
@@ -272,35 +272,41 @@ GET /a/b/c.data?_routes=routes/c
 
 ### Resource Routes
 
-Because of the new streaming format used by Single Fetch, raw JavaScript objects returned from `loader` and `action` functions are no longer automatically converted to `Response` instances via the `json()` utility. Instead, in normal navigational data loads they're combined with the other loader data and streamed down in a `turbo-stream` response. Resource routes are unique because they're intended to be hit individually -- and not always via Remix client side code. They can also be accessed via any other HTTP client (`fetch`, `cURL`, etc.).
+Because of the new [streaming format][streaming-format] used by Single Fetch, raw JavaScript objects returned from `loader` and `action` functions are no longer automatically converted to `Response` instances via the `json()` utility. Instead, in navigational data loads they're combined with the other loader data and streamed down in a `turbo-stream` response.
 
-With Single Fetch enabled, raw Javascript objects returned from resource routes will be handled as follows:
+This poses an interesting conundrum for [resource routes][resource-routes] which are unique because they're intended to be hit individually -- and not always via Remix APIs. They can also be accessed via any other HTTP client (`fetch`, `cURL`, etc.).
 
-When accessing from a Remix API such as `useFetcher`, raw Javascript objects will be returned as turbo-stream responses, just like normal loaders and actions (this is because `useFetcher` will append the `.data` suffix to the request).
+If a resource route is intended for consumption by internal Remix APIs, we _want_ to be able to leverage the `turbo-stream` encoding to unlock the ability to stream down more complex structures such as `Date` and `Promise` instances. However, when accessed externally, we'd probably prefer to return the more easily consumable JSON structure. Thus, the behavior is slightly ambiguous if you return a raw object in v2 - should it be serialized via `turbo-stream` or `json()`?
 
-When accessing from an external tool such as `fetch` or `cURL`, we will continue this automatic conversion to `json()` or backwards-compatibility in v2:
+To ease backwards-compatibility and ease the adoption of the single fetch future flag, Remix v2 will handle this based on whether it's accessed from a Remix API or externally. In the future Remix will require you to return your own JSON response if you do not want raw objects to be streamed down for external consumption.
 
-- When we detect a raw object for an external request in v2, we will will log a deprecation warning and wrap the value in `json()` for easier opt-into the Single Fetch feature
-- At your convenience, you can add the `json()` call to your resource route handlers to stop returning raw objects when you want a JSON response for external consumption
-- Once you've addressed all of the deprecation warnings in your application's resource routes, you will be better prepared for the eventual Remix v3 upgrade
+The Remix v2 behavior is as follows:
 
-```tsx filename=app/routes/resource.tsx bad
-export function loader() {
-  return {
-    message: "My externally-accessed resource route",
-  };
-}
-```
+- When accessing from a Remix API such as `useFetcher`, raw Javascript objects will be returned as `turbo-stream` responses, just like normal loaders and actions (this is because `useFetcher` will append the `.data` suffix to the request)
 
-```tsx filename=app/routes/resource.tsx good
-import { json } from "@remix-run/react";
+- When accessing from an external tool such as `fetch` or `cURL`, we will continue this automatic conversion to `json()` for backwards-compatibility in v2:
 
-export function loader() {
-  return json({
-    message: "My externally-accessed resource route",
-  });
-}
-```
+  - Remix will log a deprecation warning when this situation is encountered
+  - At your convenience, you can add the `json()` call to impacted resource route handlers
+  - Addressing these deprecation warnings will better prepare you for the eventual Remix v3 upgrade
+
+  ```tsx filename=app/routes/resource.tsx bad
+  export function loader() {
+    return {
+      message: "My externally-accessed resource route",
+    };
+  }
+  ```
+
+  ```tsx filename=app/routes/resource.tsx good
+  import { json } from "@remix-run/react";
+
+  export function loader() {
+    return json({
+      message: "My externally-accessed resource route",
+    });
+  }
+  ```
 
 #### Response Stub and Resource Routes
 
@@ -354,3 +360,4 @@ It's best to try to avoid using the `response` stub _and also_ returning a `Resp
 [mdn-headers]: https://developer.mozilla.org/en-US/docs/Web/API/Headers
 [resource-routes]: ../guides/resource-routes
 [responsestub]: #headers
+[streaming-format]: #streaming-data-format

From 3d8eeaf7ca2555e0a947ff7be6e996737d44b8b4 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Mon, 6 May 2024 17:22:39 -0400
Subject: [PATCH 103/108] Dont log single fetch thrown redirect response stubs
 via handleError (#9369)

---
 .changeset/rare-dodos-push.md                 |  5 ++
 integration/single-fetch-test.ts              | 75 +++++++++++++++++++
 packages/remix-server-runtime/server.ts       | 23 +++---
 packages/remix-server-runtime/single-fetch.ts |  4 +-
 4 files changed, 94 insertions(+), 13 deletions(-)
 create mode 100644 .changeset/rare-dodos-push.md

diff --git a/.changeset/rare-dodos-push.md b/.changeset/rare-dodos-push.md
new file mode 100644
index 00000000000..f8154384efa
--- /dev/null
+++ b/.changeset/rare-dodos-push.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/server-runtime": patch
+---
+
+Don't log thrown response stubs via `handleError` in Single Fetch
diff --git a/integration/single-fetch-test.ts b/integration/single-fetch-test.ts
index 7b1abd76f95..ad0a3cf4fac 100644
--- a/integration/single-fetch-test.ts
+++ b/integration/single-fetch-test.ts
@@ -1667,6 +1667,81 @@ test.describe("single-fetch", () => {
     );
   });
 
+  test("does not log thrown redirect response stubs via handleError", async () => {
+    let fixture = await createFixture({
+      config: {
+        future: {
+          unstable_singleFetch: true,
+        },
+      },
+      files: {
+        ...files,
+        "app/routes/redirect.tsx": js`
+          export function action({ response }) {
+            response.status = 301;
+            response.headers.set("Location", "/data");
+            throw response;
+          }
+          export function loader({ response }) {
+            response.status = 301;
+            response.headers.set("Location", "/data");
+            throw response;
+          }
+          export default function Component() {
+            return <h1>Should not see me</h1>;
+          }
+        `,
+      },
+    });
+
+    let errorLogs = [];
+    console.error = (e) => errorLogs.push(e);
+    await fixture.requestDocument("/redirect");
+    await fixture.requestSingleFetchData("/redirect.data");
+    await fixture.requestSingleFetchData("/redirect.data", {
+      method: "post",
+      body: null,
+    });
+    expect(errorLogs.length).toBe(0);
+  });
+
+  test("does not log thrown non-redirect response stubs via handleError", async () => {
+    let fixture = await createFixture({
+      config: {
+        future: {
+          unstable_singleFetch: true,
+        },
+      },
+      files: {
+        ...files,
+        "app/routes/redirect.tsx": js`
+          export function action({ response }) {
+            response.status = 400;
+            throw response;
+          }
+          export function loader({ response }) {
+            response.status = 400;
+            throw response;
+          }
+          export default function Component() {
+            return <h1>Should not see me</h1>;
+          }
+        `,
+      },
+    });
+
+    let errorLogs = [];
+    console.error = (e) => errorLogs.push(e);
+    await fixture.requestDocument("/redirect");
+    expect(errorLogs.length).toBe(1); // ErrorBoundary render logs this
+    await fixture.requestSingleFetchData("/redirect.data");
+    await fixture.requestSingleFetchData("/redirect.data", {
+      method: "post",
+      body: null,
+    });
+    expect(errorLogs.length).toBe(1);
+  });
+
   test.describe("client loaders", () => {
     test("when no routes have client loaders", async ({ page }) => {
       let fixture = await createFixture(
diff --git a/packages/remix-server-runtime/server.ts b/packages/remix-server-runtime/server.ts
index 11305551c9c..e73f7308fb6 100644
--- a/packages/remix-server-runtime/server.ts
+++ b/packages/remix-server-runtime/server.ts
@@ -40,6 +40,7 @@ import {
   getSingleFetchDataStrategy,
   getSingleFetchRedirect,
   getSingleFetchResourceRouteDataStrategy,
+  isResponseStub,
   mergeResponseStubs,
   singleFetchAction,
   singleFetchLoaders,
@@ -408,17 +409,6 @@ async function handleDocumentRequest(
     return context;
   }
 
-  // Sanitize errors outside of development environments
-  if (context.errors) {
-    Object.values(context.errors).forEach((err) => {
-      // @ts-expect-error This is "private" from users but intended for internal use
-      if (!isRouteErrorResponse(err) || err.error) {
-        handleError(err);
-      }
-    });
-    context.errors = sanitizeErrors(context.errors, serverMode);
-  }
-
   let statusCode: number;
   let headers: Headers;
   if (build.future.unstable_singleFetch) {
@@ -437,6 +427,17 @@ async function handleDocumentRequest(
     headers = getDocumentHeaders(build, context);
   }
 
+  // Sanitize errors outside of development environments
+  if (context.errors) {
+    Object.values(context.errors).forEach((err) => {
+      // @ts-expect-error `err.error` is "private" from users but intended for internal use
+      if ((!isRouteErrorResponse(err) || err.error) && !isResponseStub(err)) {
+        handleError(err);
+      }
+    });
+    context.errors = sanitizeErrors(context.errors, serverMode);
+  }
+
   // Server UI state to send to the client.
   // - When single fetch is enabled, this is streamed down via `serverHandoffStream`
   // - Otherwise it's stringified into `serverHandoffString`
diff --git a/packages/remix-server-runtime/single-fetch.ts b/packages/remix-server-runtime/single-fetch.ts
index bdfe745f7fc..c9303e79be0 100644
--- a/packages/remix-server-runtime/single-fetch.ts
+++ b/packages/remix-server-runtime/single-fetch.ts
@@ -184,7 +184,7 @@ export async function singleFetchAction(
     if (context.errors) {
       Object.values(context.errors).forEach((err) => {
         // @ts-expect-error This is "private" from users but intended for internal use
-        if (!isRouteErrorResponse(err) || err.error) {
+        if ((!isRouteErrorResponse(err) || err.error) && !isResponseStub(err)) {
           handleError(err);
         }
       });
@@ -273,7 +273,7 @@ export async function singleFetchLoaders(
     if (context.errors) {
       Object.values(context.errors).forEach((err) => {
         // @ts-expect-error This is "private" from users but intended for internal use
-        if (!isRouteErrorResponse(err) || err.error) {
+        if ((!isRouteErrorResponse(err) || err.error) && !isResponseStub(err)) {
           handleError(err);
         }
       });

From 142f47be5d65a49ed4441451d71ddf57fa59ce55 Mon Sep 17 00:00:00 2001
From: Andrew Haines <andrew@haines.org.nz>
Date: Mon, 6 May 2024 22:44:13 +0100
Subject: [PATCH 104/108] Allow a nonce to be set on single fetch stream
 transfer inline scripts (#9364)

Co-authored-by: Matt Brophy <matt@brophy.org>
---
 .changeset/nasty-vans-brake.md        |  5 ++
 docs/guides/single-fetch.md           |  6 ++
 integration/single-fetch-test.ts      | 92 +++++++++++++++++++++++++++
 packages/remix-react/server.tsx       |  3 +
 packages/remix-react/single-fetch.tsx |  5 ++
 5 files changed, 111 insertions(+)
 create mode 100644 .changeset/nasty-vans-brake.md

diff --git a/.changeset/nasty-vans-brake.md b/.changeset/nasty-vans-brake.md
new file mode 100644
index 00000000000..8e0b5efc993
--- /dev/null
+++ b/.changeset/nasty-vans-brake.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/react": patch
+---
+
+Allow a nonce to be set on single fetch stream transfer inline scripts
diff --git a/docs/guides/single-fetch.md b/docs/guides/single-fetch.md
index 24698c02a55..86bd2b590a9 100644
--- a/docs/guides/single-fetch.md
+++ b/docs/guides/single-fetch.md
@@ -344,6 +344,10 @@ It's best to try to avoid using the `response` stub _and also_ returning a `Resp
 - The `Response` instance status will take priority over any `response` stub status
 - Headers operations on the `response` stub `headers` will be re-played on the returned `Response` headers instance
 
+### Inline Scripts
+
+The `<RemixServer>` component renders inline scripts that handle the streaming data on the client side. If you have a [content security policy for scripts][csp] with [nonce-sources][csp-nonce], you can use `<RemixServer nonce>` to pass through the nonce to these `<script>` tags.
+
 [future-flags]: ../file-conventions/remix-config#future
 [should-revalidate]: ../route/should-revalidate
 [entry-server]: ../file-conventions/entry.server
@@ -361,3 +365,5 @@ It's best to try to avoid using the `response` stub _and also_ returning a `Resp
 [resource-routes]: ../guides/resource-routes
 [responsestub]: #headers
 [streaming-format]: #streaming-data-format
+[csp]: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/script-src
+[csp-nonce]: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/Sources#sources
diff --git a/integration/single-fetch-test.ts b/integration/single-fetch-test.ts
index ad0a3cf4fac..75807384b80 100644
--- a/integration/single-fetch-test.ts
+++ b/integration/single-fetch-test.ts
@@ -2542,4 +2542,96 @@ test.describe("single-fetch", () => {
       expect(await app.page.locator("nav link[as='fetch']").count()).toEqual(0);
     });
   });
+
+  test("supports nonce on streaming script tags", async ({ page }) => {
+    let fixture = await createFixture({
+      config: {
+        future: {
+          unstable_singleFetch: true,
+        },
+      },
+      files: {
+        ...files,
+        "app/root.tsx": js`
+          import { Links, Meta, Outlet, Scripts } from "@remix-run/react";
+
+          export function loader() {
+            return {
+              message: "ROOT",
+            };
+          }
+
+          export default function Root() {
+            return (
+              <html lang="en">
+                <head>
+                  <Meta />
+                  <Links />
+                </head>
+                <body>
+                  <Outlet />
+                  <Scripts nonce="the-nonce" />
+                </body>
+              </html>
+            );
+          }
+        `,
+        "app/entry.server.tsx": js`
+          import { PassThrough } from "node:stream";
+
+          import type { EntryContext } from "@remix-run/node";
+          import { createReadableStreamFromReadable } from "@remix-run/node";
+          import { RemixServer } from "@remix-run/react";
+          import { renderToPipeableStream } from "react-dom/server";
+
+          export default function handleRequest(
+            request: Request,
+            responseStatusCode: number,
+            responseHeaders: Headers,
+            remixContext: EntryContext
+          ) {
+            return new Promise((resolve, reject) => {
+              const { pipe } = renderToPipeableStream(
+                <RemixServer context={remixContext} url={request.url} nonce="the-nonce" />,
+                {
+                  onShellReady() {
+                    const body = new PassThrough();
+                    const stream = createReadableStreamFromReadable(body);
+                    responseHeaders.set("Content-Type", "text/html");
+                    resolve(
+                      new Response(stream, {
+                        headers: responseHeaders,
+                        status: responseStatusCode,
+                      })
+                    );
+                    pipe(body);
+                  },
+                  onShellError(error: unknown) {
+                    reject(error);
+                  },
+                  onError(error: unknown) {
+                    responseStatusCode = 500;
+                  },
+                }
+              );
+            });
+          }
+        `,
+      },
+    });
+    let appFixture = await createAppFixture(fixture);
+    let app = new PlaywrightFixture(appFixture, page);
+    await app.goto("/data", true);
+    let scripts = await page.$$("script");
+    expect(scripts.length).toBe(6);
+    let remixScriptsCount = 0;
+    for (let script of scripts) {
+      let content = await script.innerHTML();
+      if (content.includes("window.__remix")) {
+        remixScriptsCount++;
+        expect(await script.getAttribute("nonce")).toEqual("the-nonce");
+      }
+    }
+    expect(remixScriptsCount).toBe(4);
+  });
 });
diff --git a/packages/remix-react/server.tsx b/packages/remix-react/server.tsx
index c5fefed4d86..075644e96fa 100644
--- a/packages/remix-react/server.tsx
+++ b/packages/remix-react/server.tsx
@@ -15,6 +15,7 @@ export interface RemixServerProps {
   context: EntryContext;
   url: string | URL;
   abortDelay?: number;
+  nonce?: string;
 }
 
 /**
@@ -26,6 +27,7 @@ export function RemixServer({
   context,
   url,
   abortDelay,
+  nonce,
 }: RemixServerProps): ReactElement {
   if (typeof url === "string") {
     url = new URL(url);
@@ -101,6 +103,7 @@ export function RemixServer({
             identifier={0}
             reader={context.serverHandoffStream.getReader()}
             textDecoder={new TextDecoder()}
+            nonce={nonce}
           />
         </React.Suspense>
       ) : null}
diff --git a/packages/remix-react/single-fetch.tsx b/packages/remix-react/single-fetch.tsx
index af2331c845e..a3bd1bed8c3 100644
--- a/packages/remix-react/single-fetch.tsx
+++ b/packages/remix-react/single-fetch.tsx
@@ -29,6 +29,7 @@ interface StreamTransferProps {
   identifier: number;
   reader: ReadableStreamDefaultReader<Uint8Array>;
   textDecoder: TextDecoder;
+  nonce?: string;
 }
 
 // StreamTransfer recursively renders down chunks of the `serverHandoffStream`
@@ -38,6 +39,7 @@ export function StreamTransfer({
   identifier,
   reader,
   textDecoder,
+  nonce,
 }: StreamTransferProps) {
   // If the user didn't render the <Scripts> component then we don't have to
   // bother streaming anything in
@@ -74,6 +76,7 @@ export function StreamTransfer({
   let { done, value } = promise.result;
   let scriptTag = value ? (
     <script
+      nonce={nonce}
       dangerouslySetInnerHTML={{
         __html: `window.__remixContext.streamController.enqueue(${escapeHtml(
           JSON.stringify(value)
@@ -87,6 +90,7 @@ export function StreamTransfer({
       <>
         {scriptTag}
         <script
+          nonce={nonce}
           dangerouslySetInnerHTML={{
             __html: `window.__remixContext.streamController.close();`,
           }}
@@ -103,6 +107,7 @@ export function StreamTransfer({
             identifier={identifier + 1}
             reader={reader}
             textDecoder={textDecoder}
+            nonce={nonce}
           />
         </React.Suspense>
       </>

From feb25eb42439bf2990931db9a200dbd42ac31b1e Mon Sep 17 00:00:00 2001
From: Ikko Eltociear Ashimine <eltociear@gmail.com>
Date: Tue, 7 May 2024 22:15:57 +0900
Subject: [PATCH 105/108] refactor(remix-dev/vite): fix typo in
 resolve-file-url.ts (#9383)

---
 packages/remix-dev/vite/resolve-file-url.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/remix-dev/vite/resolve-file-url.ts b/packages/remix-dev/vite/resolve-file-url.ts
index 37482705f5b..8908ad7e0a8 100644
--- a/packages/remix-dev/vite/resolve-file-url.ts
+++ b/packages/remix-dev/vite/resolve-file-url.ts
@@ -13,7 +13,7 @@ export const resolveFileUrl = (
 
   if (!isWithinRoot) {
     // Vite will prevent serving files outside of the workspace
-    // unless user explictly opts in with `server.fs.allow`
+    // unless user explicitly opts in with `server.fs.allow`
     // https://vitejs.dev/config/server-options.html#server-fs-allow
     return path.posix.join("/@fs", vite.normalizePath(filePath));
   }

From dafe70e4523ff23b0575b352cc3fa479ac093c1e Mon Sep 17 00:00:00 2001
From: Pedro Cattori <pcattori@gmail.com>
Date: Wed, 8 May 2024 20:08:36 -0400
Subject: [PATCH 106/108] Single-fetch typesafety: `defineLoader` and
 `defineAction` (#9372)

---
 .changeset/rotten-geckos-yawn.md              |  50 +++++++++
 docs/guides/single-fetch.md                   |  61 ++++++++++-
 packages/remix-cloudflare/index.ts            |   4 +
 packages/remix-deno/index.ts                  |   4 +
 packages/remix-node/index.ts                  |   4 +
 packages/remix-react/future/single-fetch.d.ts | 102 ++++--------------
 packages/remix-server-runtime/index.ts        |  13 ++-
 packages/remix-server-runtime/single-fetch.ts |  78 ++++++++++++++
 8 files changed, 231 insertions(+), 85 deletions(-)
 create mode 100644 .changeset/rotten-geckos-yawn.md

diff --git a/.changeset/rotten-geckos-yawn.md b/.changeset/rotten-geckos-yawn.md
new file mode 100644
index 00000000000..72862e112a7
--- /dev/null
+++ b/.changeset/rotten-geckos-yawn.md
@@ -0,0 +1,50 @@
+---
+"@remix-run/cloudflare": patch
+"@remix-run/deno": patch
+"@remix-run/node": patch
+"@remix-run/react": patch
+"@remix-run/server-runtime": patch
+---
+
+Typesafety for single-fetch: defineLoader, defineClientLoader, defineAction, defineClientAction
+
+`defineLoader` and `defineAction` are helpers for authoring `loader`s and `action`s.
+They are identity functions; they don't modify your loader or action at runtime.
+Rather, they exist solely for typesafety by providing types for args and by ensuring valid return types.
+
+```ts
+export let loader = defineLoader(({ request }) => {
+  //                                ^? Request
+  return {a:1, b: () => 2}
+  //           ^ type error: `b` is not serializable
+})
+```
+
+Note that `defineLoader` and `defineAction` are not technically necessary for defining loaders and actions if you aren't concerned with typesafety:
+
+```ts
+// this totally works! and typechecking is happy too!
+export let loader = () => {
+  return {a: 1}
+}
+```
+
+This means that you can opt-in to `defineLoader` incrementally, one loader at a time.
+
+You can return custom responses via the `json`/`defer` utilities, but doing so will revert back to the old JSON-based typesafety mechanism:
+
+```ts
+let loader1 = () => {
+  return {a: 1, b: new Date()}
+}
+let data1 = useLoaderData<typeof loader1>()
+//  ^? {a: number, b: Date}
+
+let loader2 = () => {
+  return json({a: 1, b: new Date()}) // this opts-out of turbo-stream
+}
+let data2 = useLoaderData<typeof loader2>()
+//  ^? JsonifyObject<{a: number, b: Date}> which is really {a: number, b: string}
+```
+
+You can also continue to return totally custom responses with `Response` though this continues to be outside of the typesystem since the built-in `Response` type is not generic
diff --git a/docs/guides/single-fetch.md b/docs/guides/single-fetch.md
index 86bd2b590a9..8a7d396dbcc 100644
--- a/docs/guides/single-fetch.md
+++ b/docs/guides/single-fetch.md
@@ -98,13 +98,66 @@ In order to ensure you get the proper types when using Single Fetch, we've inclu
 
 ```json
 {
-  "include": [
-    // ...
-    "node_modules/@remix-run/react/future/single-fetch.d.ts"
-  ]
+  "compilerOptions": {
+    "types": ["@remix-run/react/future/single-fetch.d.ts"]
+  }
 }
 ```
 
+🚨 Make sure the single-fetch types come after any other Remix packages in `types` so that they override those existing types.
+
+** `defineLoader`, `defineAction`, `defineClientLoader`, `defineClientAction` **
+
+To get typesafety when defining loaders and actions, you can use the `defineLoader` and `defineAction` utilities:
+
+```ts
+import { defineLoader } from "@remix-run/node";
+
+export const loader = defineLoader(({ request }) => {
+  //                                  ^? Request
+});
+
+export const action = defineAction(({ context }) => {
+  //                                  ^? AppLoadContext
+});
+```
+
+Not only does this give you types for any arguments, but it also ensures you are returning single-fetch compatible types:
+
+```ts
+export const loader = defineLoader(() => {
+  return { hello: "world", badData: () => 1 };
+  //                       ^^^^^^^ Type error: `badData` is not serializable
+});
+
+export const action = defineAction(() => {
+  return { hello: "world", badData: new CustomType() };
+  //                       ^^^^^^^ Type error: `badData` is not serializable
+});
+```
+
+Single-fetch supports the following return types:
+
+```ts
+type Serializable =
+  | undefined
+  | null
+  | boolean
+  | string
+  | symbol
+  | number
+  | bigint
+  | Date
+  | URL
+  | RegExp
+  | Error
+  | Array<Serializable>
+  | { [key: PropertyKey]: Serializable } // objects with serializable values
+  | Map<Serializable, Serializable>
+  | Set<Serializable>
+  | Promise<Serializable>;
+```
+
 **`useLoaderData`, `useActionData`, `useRouteLoaderData`, and `useFetcher`**
 
 These methods do not require any code changes on your part - adding the single fetch types will cause their generics to deserialize correctly:
diff --git a/packages/remix-cloudflare/index.ts b/packages/remix-cloudflare/index.ts
index e9937361263..d1463dbcaf7 100644
--- a/packages/remix-cloudflare/index.ts
+++ b/packages/remix-cloudflare/index.ts
@@ -12,6 +12,10 @@ export {
 export {
   createRequestHandler,
   createSession,
+  unstable_defineLoader,
+  unstable_defineClientLoader,
+  unstable_defineAction,
+  unstable_defineClientAction,
   defer,
   broadcastDevReady,
   logDevReady,
diff --git a/packages/remix-deno/index.ts b/packages/remix-deno/index.ts
index 08c67e64f07..160c21d9d50 100644
--- a/packages/remix-deno/index.ts
+++ b/packages/remix-deno/index.ts
@@ -16,6 +16,10 @@ export {
 export {
   broadcastDevReady,
   createSession,
+  unstable_defineLoader,
+  unstable_defineClientLoader,
+  unstable_defineAction,
+  unstable_defineClientAction,
   defer,
   isCookie,
   isSession,
diff --git a/packages/remix-node/index.ts b/packages/remix-node/index.ts
index 1caccaf7ba0..e1587d6dcbc 100644
--- a/packages/remix-node/index.ts
+++ b/packages/remix-node/index.ts
@@ -24,6 +24,10 @@ export {
 export {
   createRequestHandler,
   createSession,
+  unstable_defineLoader,
+  unstable_defineClientLoader,
+  unstable_defineAction,
+  unstable_defineClientAction,
   defer,
   broadcastDevReady,
   logDevReady,
diff --git a/packages/remix-react/future/single-fetch.d.ts b/packages/remix-react/future/single-fetch.d.ts
index ddef3d7098c..fa37a8a338b 100644
--- a/packages/remix-react/future/single-fetch.d.ts
+++ b/packages/remix-react/future/single-fetch.d.ts
@@ -1,100 +1,46 @@
 import type { MetaArgs, UIMatch, UNSAFE_MetaMatch } from "@remix-run/react";
 import type {
-  LoaderFunctionArgs,
-  ActionFunctionArgs,
-  SerializeFrom,
-  TypedDeferredData,
-  TypedResponse,
+  unstable_Loader as Loader,
+  unstable_Action as Action,
+  unstable_Serialize as Serialize,
 } from "@remix-run/server-runtime";
 import type {
   useFetcher as useFetcherRR,
   FetcherWithComponents,
 } from "react-router-dom";
 
-type Serializable =
-  | undefined
-  | null
-  | boolean
-  | string
-  | symbol
-  | number
-  | Array<Serializable>
-  | { [key: PropertyKey]: Serializable }
-  | bigint
-  | Date
-  | URL
-  | RegExp
-  | Error
-  | Map<Serializable, Serializable>
-  | Set<Serializable>
-  | Promise<Serializable>;
-
-type DataFunctionReturnValue =
-  | Serializable
-  | TypedDeferredData<Record<string, unknown>>
-  | TypedResponse<Record<string, unknown>>;
-
-type LoaderFunction_SingleFetch = (
-  args: LoaderFunctionArgs
-) => Promise<DataFunctionReturnValue> | DataFunctionReturnValue;
-type ActionFunction_SingleFetch = (
-  args: ActionFunctionArgs
-) => Promise<DataFunctionReturnValue> | DataFunctionReturnValue;
-
-// Backwards-compatible type for Remix v2 where json/defer still use the old types,
-// and only non-json/defer returns use the new types.  This allows for incremental
-// migration of loaders to return naked objects.  In the next major version,
-// json/defer will be removed so everything will use the new simplified typings.
-// prettier-ignore
-type SingleFetchSerialize_V2<T extends LoaderFunction_SingleFetch | ActionFunction_SingleFetch> =
-  Awaited<ReturnType<T>> extends TypedDeferredData<infer D> ? D :
-  Awaited<ReturnType<T>> extends TypedResponse<Record<string, unknown>> ? SerializeFrom<T> :
-  Awaited<ReturnType<T>>;
-
 declare module "@remix-run/react" {
-  export function useLoaderData<T>(): T extends LoaderFunction_SingleFetch
-    ? SingleFetchSerialize_V2<T>
-    : never;
+  export function useLoaderData<T extends Loader>(): Serialize<T>;
 
-  export function useActionData<T>(): T extends ActionFunction_SingleFetch
-    ? SingleFetchSerialize_V2<T> | undefined
-    : never;
+  export function useActionData<T extends Action>(): Serialize<T> | undefined;
 
-  export function useRouteLoaderData<T>(
+  export function useRouteLoaderData<T extends Loader>(
     routeId: string
-  ): T extends LoaderFunction_SingleFetch ? SingleFetchSerialize_V2<T> : never;
+  ): Serialize<T>;
 
-  export function useFetcher<TData = unknown>(
+  export function useFetcher<T extends Loader | Action>(
     opts?: Parameters<typeof useFetcherRR>[0]
-  ): FetcherWithComponents<
-    TData extends LoaderFunction_SingleFetch | ActionFunction_SingleFetch
-      ? SingleFetchSerialize_V2<TData>
-      : never
-  >;
+  ): FetcherWithComponents<Serialize<T>>;
 
   export type UIMatch_SingleFetch<D = unknown, H = unknown> = Omit<
     UIMatch<D, H>,
     "data"
   > & {
-    data: D extends LoaderFunction_SingleFetch
-      ? SingleFetchSerialize_V2<D>
-      : never;
+    data: D extends Loader ? Serialize<D> : never;
   };
 
   interface MetaMatch_SingleFetch<
     RouteId extends string = string,
-    Loader extends LoaderFunction_SingleFetch | unknown = unknown
-  > extends Omit<UNSAFE_MetaMatch<RouteId, Loader>, "data"> {
-    data: Loader extends LoaderFunction_SingleFetch
-      ? SingleFetchSerialize_V2<Loader>
-      : unknown;
+    L extends Loader | unknown = unknown
+  > extends Omit<UNSAFE_MetaMatch<RouteId, L>, "data"> {
+    data: L extends Loader ? Serialize<L> : unknown;
   }
 
   type MetaMatches_SingleFetch<
-    MatchLoaders extends Record<
+    MatchLoaders extends Record<string, Loader | unknown> = Record<
       string,
-      LoaderFunction_SingleFetch | unknown
-    > = Record<string, unknown>
+      unknown
+    >
   > = Array<
     {
       [K in keyof MatchLoaders]: MetaMatch_SingleFetch<
@@ -105,17 +51,13 @@ declare module "@remix-run/react" {
   >;
 
   export interface MetaArgs_SingleFetch<
-    Loader extends LoaderFunction_SingleFetch | unknown = unknown,
-    MatchLoaders extends Record<
+    L extends Loader | unknown = unknown,
+    MatchLoaders extends Record<string, Loader | unknown> = Record<
       string,
-      LoaderFunction_SingleFetch | unknown
-    > = Record<string, unknown>
-  > extends Omit<MetaArgs<Loader, MatchLoaders>, "data" | "matches"> {
-    data:
-      | (Loader extends LoaderFunction_SingleFetch
-          ? SingleFetchSerialize_V2<Loader>
-          : unknown)
-      | undefined;
+      unknown
+    >
+  > extends Omit<MetaArgs<L, MatchLoaders>, "data" | "matches"> {
+    data: (L extends Loader ? Serialize<L> : unknown) | undefined;
     matches: MetaMatches_SingleFetch<MatchLoaders>;
   }
 }
diff --git a/packages/remix-server-runtime/index.ts b/packages/remix-server-runtime/index.ts
index 7744129cdb7..2840bdc6a33 100644
--- a/packages/remix-server-runtime/index.ts
+++ b/packages/remix-server-runtime/index.ts
@@ -5,11 +5,22 @@ export {
   parseMultipartFormData as unstable_parseMultipartFormData,
 } from "./formData";
 export { defer, json, redirect, redirectDocument } from "./responses";
+
+export {
+  SingleFetchRedirectSymbol as UNSAFE_SingleFetchRedirectSymbol,
+  defineLoader as unstable_defineLoader,
+  defineClientLoader as unstable_defineClientLoader,
+  defineAction as unstable_defineAction,
+  defineClientAction as unstable_defineClientAction,
+} from "./single-fetch";
 export type {
+  Loader as unstable_Loader,
+  Action as unstable_Action,
+  Serialize as unstable_Serialize,
   SingleFetchResult as UNSAFE_SingleFetchResult,
   SingleFetchResults as UNSAFE_SingleFetchResults,
 } from "./single-fetch";
-export { SingleFetchRedirectSymbol as UNSAFE_SingleFetchRedirectSymbol } from "./single-fetch";
+
 export { createRequestHandler } from "./server";
 export {
   createSession,
diff --git a/packages/remix-server-runtime/single-fetch.ts b/packages/remix-server-runtime/single-fetch.ts
index c9303e79be0..a0dd631dc20 100644
--- a/packages/remix-server-runtime/single-fetch.ts
+++ b/packages/remix-server-runtime/single-fetch.ts
@@ -1,4 +1,6 @@
 import type {
+  ActionFunctionArgs as RRActionArgs,
+  LoaderFunctionArgs as RRLoaderArgs,
   StaticHandler,
   unstable_DataStrategyFunctionArgs as DataStrategyFunctionArgs,
   unstable_DataStrategyFunction as DataStrategyFunction,
@@ -19,7 +21,9 @@ import type {
   ResponseStubOperation,
 } from "./routeModules";
 import { ResponseStubOperationsSymbol } from "./routeModules";
+import type { TypedDeferredData, TypedResponse } from "./responses";
 import { isDeferredData, isRedirectStatusCode, isResponse } from "./responses";
+import type { SerializeFrom } from "./serialize";
 
 export const SingleFetchRedirectSymbol = Symbol("SingleFetchRedirect");
 const ResponseStubActionSymbol = Symbol("ResponseStubAction");
@@ -504,3 +508,77 @@ export function encodeViaTurboStream(
     ],
   });
 }
+
+type MaybePromise<T> = T | Promise<T>;
+
+type Serializable =
+  | undefined
+  | null
+  | boolean
+  | string
+  | symbol
+  | number
+  | Array<Serializable>
+  | { [key: PropertyKey]: Serializable }
+  | bigint
+  | Date
+  | URL
+  | RegExp
+  | Error
+  | Map<Serializable, Serializable>
+  | Set<Serializable>
+  | Promise<Serializable>;
+
+type DataFunctionReturnValue =
+  | Serializable
+  | TypedDeferredData<Record<string, unknown>>
+  | TypedResponse<Record<string, unknown>>;
+
+// Backwards-compatible type for Remix v2 where json/defer still use the old types,
+// and only non-json/defer returns use the new types.  This allows for incremental
+// migration of loaders to return naked objects.  In the next major version,
+// json/defer will be removed so everything will use the new simplified typings.
+// prettier-ignore
+export type Serialize<T extends Loader | ClientLoader | Action | ClientAction> =
+  Awaited<ReturnType<T>> extends TypedDeferredData<infer D> ? D :
+  Awaited<ReturnType<T>> extends TypedResponse<Record<string, unknown>> ? SerializeFrom<T> :
+  Awaited<ReturnType<T>>;
+
+// loader
+type LoaderArgs = RRLoaderArgs<AppLoadContext> & {
+  // Context is always provided in Remix, and typed for module augmentation support.
+  context: AppLoadContext;
+  response: ResponseStub;
+};
+export type Loader = (
+  args: LoaderArgs
+) => MaybePromise<DataFunctionReturnValue>;
+export let defineLoader = <T extends Loader>(loader: T): T => loader;
+
+// clientLoader
+type ClientLoaderArgs = RRLoaderArgs<undefined> & {
+  serverLoader: <T extends Loader>() => Promise<Serialize<T>>;
+};
+type ClientLoader = (args: ClientLoaderArgs) => MaybePromise<Serializable>;
+export let defineClientLoader = <T extends ClientLoader>(
+  clientLoader: T
+): T & { hydrate?: boolean } => clientLoader;
+
+// action
+type ActionArgs = RRActionArgs<AppLoadContext> & {
+  // Context is always provided in Remix, and typed for module augmentation support.
+  context: AppLoadContext;
+  response: ResponseStub;
+};
+export type Action = (
+  args: ActionArgs
+) => MaybePromise<DataFunctionReturnValue>;
+export let defineAction = <T extends Action>(action: T): T => action;
+
+// clientAction
+type ClientActionArgs = RRActionArgs<undefined> & {
+  serverAction: <T extends Action>() => Promise<Serialize<T>>;
+};
+type ClientAction = (args: ClientActionArgs) => MaybePromise<Serializable>;
+export let defineClientAction = <T extends ClientAction>(clientAction: T): T =>
+  clientAction;

From c650ae20e5bd4da69f2f02fb278ce714b0473ac5 Mon Sep 17 00:00:00 2001
From: Remix Run Bot <hello@remix.run>
Date: Thu, 9 May 2024 00:09:57 +0000
Subject: [PATCH 107/108] chore: format

---
 .changeset/rotten-geckos-yawn.md | 20 ++++++++++----------
 docs/guides/single-fetch.md      |  2 +-
 packages/remix-deno/index.ts     |  8 ++++----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.changeset/rotten-geckos-yawn.md b/.changeset/rotten-geckos-yawn.md
index 72862e112a7..c924d49c3e6 100644
--- a/.changeset/rotten-geckos-yawn.md
+++ b/.changeset/rotten-geckos-yawn.md
@@ -15,9 +15,9 @@ Rather, they exist solely for typesafety by providing types for args and by ensu
 ```ts
 export let loader = defineLoader(({ request }) => {
   //                                ^? Request
-  return {a:1, b: () => 2}
+  return { a: 1, b: () => 2 };
   //           ^ type error: `b` is not serializable
-})
+});
 ```
 
 Note that `defineLoader` and `defineAction` are not technically necessary for defining loaders and actions if you aren't concerned with typesafety:
@@ -25,8 +25,8 @@ Note that `defineLoader` and `defineAction` are not technically necessary for de
 ```ts
 // this totally works! and typechecking is happy too!
 export let loader = () => {
-  return {a: 1}
-}
+  return { a: 1 };
+};
 ```
 
 This means that you can opt-in to `defineLoader` incrementally, one loader at a time.
@@ -35,15 +35,15 @@ You can return custom responses via the `json`/`defer` utilities, but doing so w
 
 ```ts
 let loader1 = () => {
-  return {a: 1, b: new Date()}
-}
-let data1 = useLoaderData<typeof loader1>()
+  return { a: 1, b: new Date() };
+};
+let data1 = useLoaderData<typeof loader1>();
 //  ^? {a: number, b: Date}
 
 let loader2 = () => {
-  return json({a: 1, b: new Date()}) // this opts-out of turbo-stream
-}
-let data2 = useLoaderData<typeof loader2>()
+  return json({ a: 1, b: new Date() }); // this opts-out of turbo-stream
+};
+let data2 = useLoaderData<typeof loader2>();
 //  ^? JsonifyObject<{a: number, b: Date}> which is really {a: number, b: string}
 ```
 
diff --git a/docs/guides/single-fetch.md b/docs/guides/single-fetch.md
index 8a7d396dbcc..ac4351f0e2e 100644
--- a/docs/guides/single-fetch.md
+++ b/docs/guides/single-fetch.md
@@ -106,7 +106,7 @@ In order to ensure you get the proper types when using Single Fetch, we've inclu
 
 🚨 Make sure the single-fetch types come after any other Remix packages in `types` so that they override those existing types.
 
-** `defineLoader`, `defineAction`, `defineClientLoader`, `defineClientAction` **
+\*\* `defineLoader`, `defineAction`, `defineClientLoader`, `defineClientAction` \*\*
 
 To get typesafety when defining loaders and actions, you can use the `defineLoader` and `defineAction` utilities:
 
diff --git a/packages/remix-deno/index.ts b/packages/remix-deno/index.ts
index 160c21d9d50..9de14b92d62 100644
--- a/packages/remix-deno/index.ts
+++ b/packages/remix-deno/index.ts
@@ -16,10 +16,6 @@ export {
 export {
   broadcastDevReady,
   createSession,
-  unstable_defineLoader,
-  unstable_defineClientLoader,
-  unstable_defineAction,
-  unstable_defineClientAction,
   defer,
   isCookie,
   isSession,
@@ -30,6 +26,10 @@ export {
   redirectDocument,
   unstable_composeUploadHandlers,
   unstable_createMemoryUploadHandler,
+  unstable_defineAction,
+  unstable_defineClientAction,
+  unstable_defineClientLoader,
+  unstable_defineLoader,
   unstable_parseMultipartFormData,
 } from "@remix-run/server-runtime";
 

From 45c755219e90ce09a219c239bb5262aa148f363e Mon Sep 17 00:00:00 2001
From: Mark Dalgleish <mark.john.dalgleish@gmail.com>
Date: Thu, 9 May 2024 12:41:12 +1000
Subject: [PATCH 108/108] Clean redundant `?client-route=1` usage in dev
 (#9395)

---
 .changeset/slimy-shrimps-roll.md  |  5 ++++
 packages/remix-dev/vite/plugin.ts | 47 +++++++++++++------------------
 2 files changed, 25 insertions(+), 27 deletions(-)
 create mode 100644 .changeset/slimy-shrimps-roll.md

diff --git a/.changeset/slimy-shrimps-roll.md b/.changeset/slimy-shrimps-roll.md
new file mode 100644
index 00000000000..1af1d03992f
--- /dev/null
+++ b/.changeset/slimy-shrimps-roll.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/dev": patch
+---
+
+Clean up redundant `?client-route=1` imports in development
diff --git a/packages/remix-dev/vite/plugin.ts b/packages/remix-dev/vite/plugin.ts
index 08286d6697e..7ff22795066 100644
--- a/packages/remix-dev/vite/plugin.ts
+++ b/packages/remix-dev/vite/plugin.ts
@@ -130,9 +130,11 @@ const CLIENT_ROUTE_EXPORTS = [
   "shouldRevalidate",
 ];
 
-// The "=1" suffix ensures client route requests can be processed before hitting
-// the Vite plugin since "?client-route" can be serialized as "?client-route="
-const CLIENT_ROUTE_QUERY_STRING = "?client-route=1";
+/** This is used to manage a build optimization to remove unused route exports
+from the client build output. This is important in cases where custom route
+exports are only ever used on the server. Without this optimization we can't
+tree-shake any unused custom exports because routes are entry points. */
+const BUILD_CLIENT_ROUTE_QUERY_STRING = "?__remix-build-client-route";
 
 // Only expose a subset of route properties to the "serverBundles" function
 const branchRouteProperties = [
@@ -318,10 +320,6 @@ const getHash = (source: BinaryLike, maxLength?: number): string => {
   return typeof maxLength === "number" ? hash.slice(0, maxLength) : hash;
 };
 
-const isClientRoute = (id: string): boolean => {
-  return id.endsWith(CLIENT_ROUTE_QUERY_STRING);
-};
-
 const resolveChunk = (
   ctx: RemixPluginContext,
   viteManifest: Vite.Manifest,
@@ -332,7 +330,7 @@ const resolveChunk = (
     path.relative(ctx.rootDirectory, absoluteFilePath)
   );
   let entryChunk =
-    viteManifest[rootRelativeFilePath + CLIENT_ROUTE_QUERY_STRING] ??
+    viteManifest[rootRelativeFilePath + BUILD_CLIENT_ROUTE_QUERY_STRING] ??
     viteManifest[rootRelativeFilePath];
 
   if (!entryChunk) {
@@ -966,7 +964,7 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
           `${resolveFileUrl(
             ctx,
             resolveRelativeRouteFilePath(route, ctx.remixConfig)
-          )}${CLIENT_ROUTE_QUERY_STRING}`
+          )}`
         ),
         hasAction: sourceExports.includes("action"),
         hasLoader: sourceExports.includes("loader"),
@@ -1142,7 +1140,7 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
                                 `${path.resolve(
                                   ctx.remixConfig.appDirectory,
                                   route.file
-                                )}${CLIENT_ROUTE_QUERY_STRING}`
+                                )}${BUILD_CLIENT_ROUTE_QUERY_STRING}`
                             ),
                           ],
                         },
@@ -1271,8 +1269,8 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
           cssModulesManifest[id] = code;
         }
 
-        if (isClientRoute(id)) {
-          let routeModuleId = id.replace(CLIENT_ROUTE_QUERY_STRING, "");
+        if (id.endsWith(BUILD_CLIENT_ROUTE_QUERY_STRING)) {
+          let routeModuleId = id.replace(BUILD_CLIENT_ROUTE_QUERY_STRING, "");
           let sourceExports = await getRouteModuleExports(
             viteChildCompiler,
             ctx,
@@ -1695,10 +1693,6 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
         let useFastRefresh = !ssr && (isJSX || code.includes(devRuntime));
         if (!useFastRefresh) return;
 
-        if (isClientRoute(id)) {
-          return { code: addRefreshWrapper(ctx.remixConfig, code, id) };
-        }
-
         let result = await babel.transformAsync(code, {
           configFile: false,
           babelrc: false,
@@ -1789,17 +1783,16 @@ function addRefreshWrapper(
   id: string
 ): string {
   let route = getRoute(remixConfig, id);
-  let acceptExports =
-    route || isClientRoute(id)
-      ? [
-          "clientAction",
-          "clientLoader",
-          "handle",
-          "meta",
-          "links",
-          "shouldRevalidate",
-        ]
-      : [];
+  let acceptExports = route
+    ? [
+        "clientAction",
+        "clientLoader",
+        "handle",
+        "meta",
+        "links",
+        "shouldRevalidate",
+      ]
+    : [];
   return (
     REACT_REFRESH_HEADER.replaceAll("__SOURCE__", JSON.stringify(id)) +
     code +