Merge branch 'brophdawg11/feat-middleware' into markdalgleish/client-middleware-chunk

Author: markdalgleish

.changeset/afraid-tigers-promise.md

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

.changeset/cool-pillows-sing.md

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

.changeset/dry-impalas-live.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`

.changeset/fresh-buttons-sit.md

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

.changeset/gold-insects-remain.md

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

.changeset/hip-jars-hunt.md

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

.changeset/lucky-icons-tap.md

@@ -2,19 +2,43 @@
 "react-router": patch
 ---
 
-Support `middleware` on routes (unstable)
+Support middleware on routes (unstable)
 
-Routes can now define an array of middleware functions that will run sequentially before route handlers run. These functions accept the same arguments as `loader`/`action` plus an additional `next` function to run the remaining data pipeline. This allows middlewares to perform logic before and after handlers execute.
+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];
-export const unstable_clientMiddleware = [clientLogger];
+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,
@@ -25,33 +49,29 @@ const routes = [
 Here's a simple example of a client-side logging middleware that can be placed on the root route:
 
 ```tsx
-async function clientLogger({
-  request,
-  params,
-  context,
-  next,
-}: Route.ClientMiddlewareArgs) {
+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
-async function serverLogger({
-  request,
-  params,
-  context,
-  next,
-}: Route.MiddlewareArgs) {
+const serverLogger: Route.unstable_MiddlewareFunction = async (
+  { request, params, context },
+  next
+) => {
   let start = performance.now();
 
   // 👇 Grab the response here
@@ -60,31 +80,37 @@ async function serverLogger({
   let duration = performance.now() - start;
   console.log(`Navigated to ${request.url} (${duration}ms)`);
 
-  // 👇 And return it here
+  // 👇 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
-function serverAuth({ request, params, context, next }: Route.MiddlewareArgs) {
-  let user = context.session.get("user");
+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) {
-    context.session.set("returnTo", request.url);
+    session.set("returnTo", request.url);
     throw redirect("/login", 302);
   }
-  context.user = user;
-  // No need to call next() if you don't need to do any post processing
-}
+};
 ```
 
 _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
-async function redirects({ request, next }: Route.MiddlewareArgs) {
+const redirects: Route.unstable_MiddlewareFunction = async ({
+  request,
+  next,
+}) => {
   // attempt to handle the request
   let res = await next();
 
@@ -98,5 +124,56 @@ async function redirects({ request, next }: Route.MiddlewareArgs) {
   }
 
   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;
 }
 ```

.changeset/middleware.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

.changeset/modern-forks-ring.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`