Merge remote-tracking branch 'upstream/dev' into mwilcox/skip-imported-route-typegen

* upstream/dev: (65 commits)
  Generate types for `virtual:react-router/server-build` (remix-run#13152)
  Add support for client context and middleware (unstable) (remix-run#12941)
  Add playground for `vite-plugin-cloudflare` (remix-run#13151)
  do not typegen params for layout routes with a corresponding index (remix-run#13131) (remix-run#13140)
  Fix types for `loaderData` and `actionData` that contain `Record`s (remix-run#13139)
  chore: format
  chore(dev): remove unused dependencies (remix-run#13134)
  Remove unused Vite file system watcher (remix-run#13133)
  Remove stale changesets cherry-picked into release-next for 7.2.0
  Fix custom SSR build input with `serverBundles` (remix-run#13107)
  Skip resource route flow in dev mode when SPA  mode is enabled (remix-run#13113)
  chore: format
  Add integration test for `vite-plugin-cloudflare` (remix-run#13099)
  Fix custom client `build.rollupOptions.output.entryFileNames` (remix-run#13098)
  Detect lazy route discovery manifest version mismatches and trigger reloads (remix-run#13061)
  Fix critical CSS with custom `Vite.DevEnvironment` (remix-run#13066)
  Fix usage of `prerender` option with `serverBundles` (remix-run#13082)
  Fix support for custom `build.assetsDir` (remix-run#13077)
  Add changeset for remix-run#13064
  Only import the root route when SSRing SPA mode's index.html (remix-run#13023)
  ...

Author: wilcoxmd

Diff for: .changeset/afraid-buses-pay.md

@@ -0,0 +1,5 @@
+---
+"@react-router/dev": patch
+---
+
+Fix support for custom client `build.rollupOptions.output.entryFileNames`

Diff for: .changeset/afraid-tigers-promise.md

@@ -0,0 +1,5 @@
+---
+"react-router": patch
+---
+
+Skip resource route flow in dev server in SPA mode

Diff for: .changeset/cool-pillows-sing.md

@@ -0,0 +1,5 @@
+---
+"@react-router/dev": patch
+---
+
+Fix usage of `prerender` option when `serverBundles` option has been configured or provided by a preset, e.g. `vercelPreset` from `@vercel/react-router`

Diff for: .changeset/dry-impalas-live.md

@@ -0,0 +1,5 @@
+---
+"@react-router/dev": patch
+---
+
+Fix support for custom `build.assetsDir`

Diff for: .changeset/dull-balloons-boil.md

@@ -0,0 +1,5 @@
+---
+"@react-router/express": patch
+---
+
+Update `express` `peerDependency` to include v5 (https://github.com/remix-run/react-router/pull/13064)

Diff for: .changeset/fast-olives-invent.md

@@ -0,0 +1,5 @@
+---
+"@react-router/dev": patch
+---
+
+Remove unused dependencies

Diff for: .changeset/fresh-buttons-sit.md

@@ -0,0 +1,179 @@
+---
+"react-router": patch
+---
+
+Support middleware on routes (unstable)
+
+Middleware is implemented behind a `future.unstable_middleware` flag. To enable, you must enable the flag and the types in your `react-router-config.ts` file:
+
+```ts
+import type { Config } from "@react-router/dev/config";
+import type { Future } from "react-router";
+
+declare module "react-router" {
+  interface Future {
+    unstable_middleware: true; // 👈 Enable middleware types
+  }
+}
+
+export default {
+  future: {
+    unstable_middleware: true, // 👈 Enable middleware
+  },
+} satisfies Config;
+```
+
+⚠️ Middleware is unstable and should not be adopted in production. There is at least one known de-optimization in route module loading for `clientMiddleware` that we will be addressing this before a stable release.
+
+⚠️ Enabling middleware contains a breaking change to the `context` parameter passed to your `loader`/`action` functions - see below for more information.
+
+Once enabled, routes can define an array of middleware functions that will run sequentially before route handlers run. These functions accept the same parameters as `loader`/`action` plus an additional `next` parameter to run the remaining data pipeline. This allows middlewares to perform logic before and after handlers execute.
+
+```tsx
+// Framework mode
+export const unstable_middleware = [serverLogger, serverAuth]; // server
+export const unstable_clientMiddleware = [clientLogger]; // client
+
+// Library mode
+const routes = [
+  {
+    path: "/",
+    // Middlewares are client-side for library mode SPA's
+    unstable_middleware: [clientLogger, clientAuth],
+    loader: rootLoader,
+    Component: Root,
+  },
+];
+```
+
+Here's a simple example of a client-side logging middleware that can be placed on the root route:
+
+```tsx
+const clientLogger: Route.unstable_ClientMiddlewareFunction = async (
+  { request },
+  next
+) => {
+  let start = performance.now();
+
+  // Run the remaining middlewares and all route loaders
+  await next();
+
+  let duration = performance.now() - start;
+  console.log(`Navigated to ${request.url} (${duration}ms)`);
+};
+```
+
+Note that in the above example, the `next`/`middleware` functions don't return anything. This is by design as on the client there is no "response" to send over the network like there would be for middlewares running on the server. The data is all handled behind the scenes by the stateful `router`.
+
+For a server-side middleware, the `next` function will return the HTTP `Response` that React Router will be sending across the wire, thus giving you a chance to make changes as needed. You may throw a new response to short circuit and respond immediately, or you may return a new or altered response to override the default returned by `next()`.
+
+```tsx
+const serverLogger: Route.unstable_MiddlewareFunction = async (
+  { request, params, context },
+  next
+) => {
+  let start = performance.now();
+
+  // 👇 Grab the response here
+  let res = await next();
+
+  let duration = performance.now() - start;
+  console.log(`Navigated to ${request.url} (${duration}ms)`);
+
+  // 👇 And return it here (optional if you don't modify the response)
+  return res;
+};
+```
+
+You can throw a `redirect` from a middleware to short circuit any remaining processing:
+
+```tsx
+import { sessionContext } from "../context";
+const serverAuth: Route.unstable_MiddlewareFunction = (
+  { request, params, context },
+  next
+) => {
+  let session = context.get(sessionContext);
+  let user = session.get("user");
+  if (!user) {
+    session.set("returnTo", request.url);
+    throw redirect("/login", 302);
+  }
+};
+```
+
+_Note that in cases like this where you don't need to do any post-processing you don't need to call the `next` function or return a `Response`._
+
+Here's another example of using a server middleware to detect 404s and check the CMS for a redirect:
+
+```tsx
+const redirects: Route.unstable_MiddlewareFunction = async ({
+  request,
+  next,
+}) => {
+  // attempt to handle the request
+  let res = await next();
+
+  // if it's a 404, check the CMS for a redirect, do it last
+  // because it's expensive
+  if (res.status === 404) {
+    let cmsRedirect = await checkCMSRedirects(request.url);
+    if (cmsRedirect) {
+      throw redirect(cmsRedirect, 302);
+    }
+  }
+
+  return res;
+};
+```
+
+**`context` parameter**
+
+When middleware is enabled, your application will use a different type of `context` parameter in your loaders and actions to provide better type safety. Instead of `AppLoadContext`, `context` will now be an instance of `ContextProvider` that you can use with type-safe contexts (similar to `React.createContext`):
+
+```ts
+import { unstable_createContext } from "react-router";
+import { Route } from "./+types/root";
+import type { Session } from "./sessions.server";
+import { getSession } from "./sessions.server";
+
+let sessionContext = unstable_createContext<Session>();
+
+const sessionMiddleware: Route.unstable_MiddlewareFunction = ({
+  context,
+  request,
+}) => {
+  let session = await getSession(request);
+  context.set(sessionContext, session);
+  //                          ^ must be of type Session
+};
+
+// ... then in some downstream middleware
+const loggerMiddleware: Route.unstable_MiddlewareFunction = ({
+  context,
+  request,
+}) => {
+  let session = context.get(sessionContext);
+  //  ^ typeof Session
+  console.log(session.get("userId"), request.method, request.url);
+};
+
+// ... or some downstream loader
+export function loader({ context }: Route.LoaderArgs) {
+  let session = context.get(sessionContext);
+  let profile = await getProfile(session.get("userId"));
+  return { profile };
+}
+```
+
+If you are using a custom server with a `getLoadContext` function, the return value for initial context values passed from the server adapter layer is no longer an object and should now return an `unstable_InitialContext` (`Map<RouterContext, unknown>`):
+
+```ts
+let adapterContext = unstable_createContext<MyAdapterContext>();
+
+function getLoadContext(req, res): unstable_InitialContext {
+  let map = new Map();
+  map.set(adapterContext, getAdapterContext(req));
+  return map;
+}
+```

Diff for: .changeset/gold-insects-remain.md

@@ -0,0 +1,5 @@
+---
+"@react-router/dev": patch
+---
+
+Stub all routes except root in "SPA Mode" server builds to avoid issues when route modules or their dependencies import non-SSR-friendly modules

Diff for: .changeset/hip-jars-hunt.md

@@ -0,0 +1,5 @@
+---
+"@react-router/dev": patch
+---
+
+Fix errors with `future.unstable_viteEnvironmentApi` when the `ssr` environment has been configured by another plugin to be a custom `Vite.DevEnvironment` rather than the default `Vite.RunnableDevEnvironment`

Diff for: .changeset/khaki-rocks-cover.md

@@ -0,0 +1,5 @@
+---
+"@react-router/dev": patch
+---
+
+Remove unused Vite file system watcher

Diff for: .changeset/late-nails-hear.md

@@ -0,0 +1,25 @@
+---
+"react-router": patch
+---
+
+Fix types for loaderData and actionData that contained `Record`s
+
+UNSTABLE(BREAKING):
+
+`unstable_SerializesTo` added a way to register custom serialization types in Single Fetch for other library and framework authors like Apollo.
+It was implemented with branded type whose branded property that was made optional so that casting arbitrary values was easy:
+
+```ts
+// without the brand being marked as optional
+let x1 = 42 as unknown as unstable_SerializesTo<number>;
+//          ^^^^^^^^^^
+
+// with the brand being marked as optional
+let x2 = 42 as unstable_SerializesTo<number>;
+```
+
+However, this broke type inference in `loaderData` and `actionData` for any `Record` types as those would now (incorrectly) match `unstable_SerializesTo`.
+This affected all users, not just those that depended on `unstable_SerializesTo`.
+To fix this, the branded property of `unstable_SerializesTo` is marked as required instead of optional.
+
+For library and framework authors using `unstable_SerializesTo`, you may need to add `as unknown` casts before casting to `unstable_SerializesTo`.

Diff for: .changeset/lucky-icons-tap.md

@@ -0,0 +1,7 @@
+---
+"@react-router/dev": patch
+---
+
+Fix support for custom SSR build input when `serverBundles` option has been configured
+
+Note that for consumers using the `future.unstable_viteEnvironmentApi` and `serverBundles` options together, hyphens are no longer supported in server bundle IDs since they also need to be valid Vite environment names.

Diff for: .changeset/middleware.md

@@ -0,0 +1,9 @@
+---
+"react-router": minor
+---
+
+Add `fetcherKey` as a parameter to `patchRoutesOnNavigation`
+
+- In framework mode, Lazy Route Discovery will now detect manifest version mismatches after a new deploy
+- On navigations to undiscovered routes, this mismatch will trigger a document reload of the destination path
+- On `fetcher` calls to undiscovered routes, this mismatch will trigger a document reload of the current path

Diff for: .changeset/modern-forks-ring.md

@@ -0,0 +1,5 @@
+---
+"@react-router/dev": patch
+---
+
+Fix dev server when using HTTPS by stripping HTTP/2 pseudo headers from dev server requests

Diff for: .changeset/new-houses-hug.md

@@ -0,0 +1,5 @@
+---
+"react-router": patch
+---
+
+Fix single fetch `_root.data` requests when a `basename` is used

Diff for: .changeset/ninety-otters-repeat.md

@@ -0,0 +1,5 @@
+---
+"@react-router/dev": minor
+---
+
+Generate types for `virtual:react-router/server-build` module

Diff for: .changeset/orange-meals-repair.md

@@ -0,0 +1,5 @@
+---
+"@react-router/dev": patch
+---
+
+Lazy load Cloudflare platform proxy on first dev server request when using the `cloudflareDevProxy` Vite plugin to avoid creating unnecessary workerd processes