react-router 7.8.1 → 7.8.2-pre.1

package/dist/{production/index-react-server-client-11fLy3qB.d.mts → development/index-react-server-client-DRhjXpk2.d.mts}

@@ -1,7 +1,6 @@
-import './components-CuPfnyiZ.mjs';
+import { b6 as RouteManifest, M as MiddlewareEnabled, h as unstable_RouterContextProvider, c as LoaderFunctionArgs, A as ActionFunctionArgs, O as StaticHandlerContext, H as HydrationState, F as DataRouteObject, a3 as HTMLFormMethod, a1 as FormEncType, m as RelativeRoutingType, T as To, b7 as History, K as GetScrollRestorationKeyFunction, a as RouterInit, b8 as FutureConfig$1, k as DataStrategyFunction, C as PatchRoutesOnNavigationFunction, N as NavigateOptions, Q as Fetcher, t as RouteObject, j as Router, B as BlockerFunction, L as Location, b9 as CreateStaticHandlerOptions$1, G as StaticHandler } from './context-jKip1TFB.mjs';
 import * as React from 'react';
-import { az as RouteManifest, M as MiddlewareEnabled, o as unstable_RouterContextProvider, j as LoaderFunctionArgs, i as ActionFunctionArgs, J as StaticHandlerContext, H as HydrationState, z as DataRouteObject, a2 as HTMLFormMethod, a0 as FormEncType, a as RelativeRoutingType, T as To, aA as History, E as GetScrollRestorationKeyFunction, e as RouterInit, F as FutureConfig$1, D as DataStrategyFunction, P as PatchRoutesOnNavigationFunction, q as NavigateOptions, K as Fetcher, f as RouteObject, R as Router, B as BlockerFunction, c as Location, aB as CreateStaticHandlerOptions$1, C as StaticHandler } from './context-DohQKLID.mjs';
-import { o as ServerRouteModule, A as AppLoadContext, c as RouteModules, h as ClientLoaderFunction, m as PageLinkDescriptor, d as SerializeFrom } from './route-data-CNjObrhZ.mjs';
+import { o as ServerRouteModule, A as AppLoadContext, c as RouteModules, h as ClientLoaderFunction, m as PageLinkDescriptor, d as SerializeFrom } from './route-data-DAVP2QQ0.mjs';
 
 type ServerRouteManifest = RouteManifest<Omit<ServerRoute, "children">>;
 interface ServerRoute extends Route {

package/dist/development/index-react-server-client.d.mts

@@ -1,5 +1,4 @@
-export { f as Await, g as MemoryRouter, h as Navigate, i as Outlet, j as Route, k as Router, l as RouterProvider, m as Routes, W as UNSAFE_WithComponentProps, v as UNSAFE_WithErrorBoundaryProps, t as UNSAFE_WithHydrateFallbackProps } from './components-CuPfnyiZ.mjs';
-export { l as BrowserRouter, q as Form, m as HashRouter, n as Link, X as Links, W as Meta, p as NavLink, r as ScrollRestoration, T as StaticRouter, V as StaticRouterProvider, o as unstable_HistoryRouter } from './index-react-server-client-11fLy3qB.mjs';
-import './context-DohQKLID.mjs';
+export { aC as Await, aD as MemoryRouter, aE as Navigate, aF as Outlet, aG as Route, aH as Router, aI as RouterProvider, aJ as Routes, b0 as UNSAFE_WithComponentProps, b4 as UNSAFE_WithErrorBoundaryProps, b2 as UNSAFE_WithHydrateFallbackProps } from './context-jKip1TFB.mjs';
+export { l as BrowserRouter, q as Form, m as HashRouter, n as Link, X as Links, W as Meta, p as NavLink, r as ScrollRestoration, T as StaticRouter, V as StaticRouterProvider, o as unstable_HistoryRouter } from './index-react-server-client-DRhjXpk2.mjs';
 import 'react';
-import './route-data-CNjObrhZ.mjs';
+import './route-data-DAVP2QQ0.mjs';

package/dist/development/index-react-server-client.d.ts

@@ -1,3 +1,3 @@
-export { h as Await, V as BrowserRouter, _ as Form, W as HashRouter, X as Link, am as Links, i as MemoryRouter, al as Meta, Z as NavLink, j as Navigate, k as Outlet, l as Route, m as Router, n as RouterProvider, o as Routes, $ as ScrollRestoration, aj as StaticRouter, ak as StaticRouterProvider, az as UNSAFE_WithComponentProps, aD as UNSAFE_WithErrorBoundaryProps, aB as UNSAFE_WithHydrateFallbackProps, Y as unstable_HistoryRouter } from './index-react-server-client-BQ6FxdA_.js';
-import './routeModules-C3oqzPpI.js';
+export { aW as Await, aX as MemoryRouter, aY as Navigate, aZ as Outlet, a_ as Route, a$ as Router, b0 as RouterProvider, b1 as Routes, br as UNSAFE_WithComponentProps, bv as UNSAFE_WithErrorBoundaryProps, bt as UNSAFE_WithHydrateFallbackProps } from './routeModules-rOzWJJ9x.js';
+export { l as BrowserRouter, q as Form, m as HashRouter, n as Link, X as Links, W as Meta, p as NavLink, r as ScrollRestoration, T as StaticRouter, V as StaticRouterProvider, o as unstable_HistoryRouter } from './index-react-server-client-BKpa2trA.js';
 import 'react';

package/dist/development/index-react-server-client.js

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});/**
- * react-router v7.8.1
+ * react-router v7.8.2-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -30,11 +30,11 @@
 
 
 
-var _chunkIIA3TUI2js = require('./chunk-IIA3TUI2.js');
+var _chunkIVOVRAK2js = require('./chunk-IVOVRAK2.js');
 
 
 
-var _chunkTGXCWGPTjs = require('./chunk-TGXCWGPT.js');
+var _chunkZVMYUFGAjs = require('./chunk-ZVMYUFGA.js');
 
 
 
@@ -58,4 +58,4 @@ var _chunkTGXCWGPTjs = require('./chunk-TGXCWGPT.js');
 
 
 
-exports.Await = _chunkIIA3TUI2js.Await; exports.BrowserRouter = _chunkIIA3TUI2js.BrowserRouter; exports.Form = _chunkIIA3TUI2js.Form; exports.HashRouter = _chunkIIA3TUI2js.HashRouter; exports.Link = _chunkIIA3TUI2js.Link; exports.Links = _chunkTGXCWGPTjs.Links; exports.MemoryRouter = _chunkIIA3TUI2js.MemoryRouter; exports.Meta = _chunkTGXCWGPTjs.Meta; exports.NavLink = _chunkIIA3TUI2js.NavLink; exports.Navigate = _chunkIIA3TUI2js.Navigate; exports.Outlet = _chunkIIA3TUI2js.Outlet; exports.Route = _chunkIIA3TUI2js.Route; exports.Router = _chunkIIA3TUI2js.Router; exports.RouterProvider = _chunkIIA3TUI2js.RouterProvider; exports.Routes = _chunkIIA3TUI2js.Routes; exports.ScrollRestoration = _chunkIIA3TUI2js.ScrollRestoration; exports.StaticRouter = _chunkIIA3TUI2js.StaticRouter; exports.StaticRouterProvider = _chunkIIA3TUI2js.StaticRouterProvider; exports.UNSAFE_WithComponentProps = _chunkIIA3TUI2js.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunkIIA3TUI2js.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunkIIA3TUI2js.WithHydrateFallbackProps; exports.unstable_HistoryRouter = _chunkIIA3TUI2js.HistoryRouter;
+exports.Await = _chunkIVOVRAK2js.Await; exports.BrowserRouter = _chunkIVOVRAK2js.BrowserRouter; exports.Form = _chunkIVOVRAK2js.Form; exports.HashRouter = _chunkIVOVRAK2js.HashRouter; exports.Link = _chunkIVOVRAK2js.Link; exports.Links = _chunkZVMYUFGAjs.Links; exports.MemoryRouter = _chunkIVOVRAK2js.MemoryRouter; exports.Meta = _chunkZVMYUFGAjs.Meta; exports.NavLink = _chunkIVOVRAK2js.NavLink; exports.Navigate = _chunkIVOVRAK2js.Navigate; exports.Outlet = _chunkIVOVRAK2js.Outlet; exports.Route = _chunkIVOVRAK2js.Route; exports.Router = _chunkIVOVRAK2js.Router; exports.RouterProvider = _chunkIVOVRAK2js.RouterProvider; exports.Routes = _chunkIVOVRAK2js.Routes; exports.ScrollRestoration = _chunkIVOVRAK2js.ScrollRestoration; exports.StaticRouter = _chunkIVOVRAK2js.StaticRouter; exports.StaticRouterProvider = _chunkIVOVRAK2js.StaticRouterProvider; exports.UNSAFE_WithComponentProps = _chunkIVOVRAK2js.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunkIVOVRAK2js.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunkIVOVRAK2js.WithHydrateFallbackProps; exports.unstable_HistoryRouter = _chunkIVOVRAK2js.HistoryRouter;

package/dist/development/index-react-server-client.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.8.1
+ * react-router v7.8.2-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -32,7 +32,7 @@ import {
   WithComponentProps,
   WithErrorBoundaryProps,
   WithHydrateFallbackProps
-} from "./chunk-UH6JLGW7.mjs";
+} from "./chunk-ZVD2KUIM.mjs";
 export {
   Await,
   BrowserRouter,

package/dist/development/index-react-server.d.mts

@@ -1152,7 +1152,6 @@ type HydrationState = Partial<Pick<RouterState, "loaderData" | "actionData" | "e
  * Future flags to toggle new feature behavior
  */
 interface FutureConfig {
-    unstable_middleware: boolean;
 }
 /**
  * Initialization options for createRouter
@@ -1196,7 +1195,9 @@ interface StaticHandler {
         skipLoaderErrorBubbling?: boolean;
         skipRevalidation?: boolean;
         dataStrategy?: DataStrategyFunction<unknown>;
-        unstable_generateMiddlewareResponse?: (query: (r: Request) => Promise<StaticHandlerContext | Response>) => MaybePromise<Response>;
+        unstable_generateMiddlewareResponse?: (query: (r: Request, args?: {
+            filterMatchesToLoad?: (match: AgnosticDataRouteMatch) => boolean;
+        }) => Promise<StaticHandlerContext | Response>) => MaybePromise<Response>;
     }): Promise<StaticHandlerContext | Response>;
     queryRoute(request: Request, opts?: {
         routeId?: string;
@@ -1608,7 +1609,7 @@ type unstable_SerializesTo<T> = {
     unstable__ReactRouter_SerializesTo: [T];
 };
 
-type Serialize<T> = T extends unstable_SerializesTo<infer To> ? To : T extends Serializable ? T : T extends (...args: any[]) => unknown ? undefined : T extends Promise<infer U> ? Promise<Serialize<U>> : T extends Map<infer K, infer V> ? Map<Serialize<K>, Serialize<V>> : T extends Set<infer U> ? Set<Serialize<U>> : T extends [] ? [] : T extends readonly [infer F, ...infer R] ? [Serialize<F>, ...Serialize<R>] : T extends Array<infer U> ? Array<Serialize<U>> : T extends readonly unknown[] ? readonly Serialize<T[number]>[] : T extends Record<any, any> ? {
+type Serialize<T> = T extends unstable_SerializesTo<infer To> ? To : T extends Serializable ? T : T extends (...args: any[]) => unknown ? undefined : T extends Promise<infer U> ? Promise<Serialize<U>> : T extends Map<infer K, infer V> ? Map<Serialize<K>, Serialize<V>> : T extends ReadonlyMap<infer K, infer V> ? ReadonlyMap<Serialize<K>, Serialize<V>> : T extends Set<infer U> ? Set<Serialize<U>> : T extends ReadonlySet<infer U> ? ReadonlySet<Serialize<U>> : T extends [] ? [] : T extends readonly [infer F, ...infer R] ? [Serialize<F>, ...Serialize<R>] : T extends Array<infer U> ? Array<Serialize<U>> : T extends readonly unknown[] ? readonly Serialize<T[number]>[] : T extends Record<any, any> ? {
     [K in keyof T]: Serialize<T[K]>;
 } : undefined;
 type VoidToUndefined<T> = Equal<T, void> extends true ? undefined : T;

package/dist/development/index-react-server.d.ts

@@ -1152,7 +1152,6 @@ type HydrationState = Partial<Pick<RouterState, "loaderData" | "actionData" | "e
  * Future flags to toggle new feature behavior
  */
 interface FutureConfig {
-    unstable_middleware: boolean;
 }
 /**
  * Initialization options for createRouter
@@ -1196,7 +1195,9 @@ interface StaticHandler {
         skipLoaderErrorBubbling?: boolean;
         skipRevalidation?: boolean;
         dataStrategy?: DataStrategyFunction<unknown>;
-        unstable_generateMiddlewareResponse?: (query: (r: Request) => Promise<StaticHandlerContext | Response>) => MaybePromise<Response>;
+        unstable_generateMiddlewareResponse?: (query: (r: Request, args?: {
+            filterMatchesToLoad?: (match: AgnosticDataRouteMatch) => boolean;
+        }) => Promise<StaticHandlerContext | Response>) => MaybePromise<Response>;
     }): Promise<StaticHandlerContext | Response>;
     queryRoute(request: Request, opts?: {
         routeId?: string;
@@ -1608,7 +1609,7 @@ type unstable_SerializesTo<T> = {
     unstable__ReactRouter_SerializesTo: [T];
 };
 
-type Serialize<T> = T extends unstable_SerializesTo<infer To> ? To : T extends Serializable ? T : T extends (...args: any[]) => unknown ? undefined : T extends Promise<infer U> ? Promise<Serialize<U>> : T extends Map<infer K, infer V> ? Map<Serialize<K>, Serialize<V>> : T extends Set<infer U> ? Set<Serialize<U>> : T extends [] ? [] : T extends readonly [infer F, ...infer R] ? [Serialize<F>, ...Serialize<R>] : T extends Array<infer U> ? Array<Serialize<U>> : T extends readonly unknown[] ? readonly Serialize<T[number]>[] : T extends Record<any, any> ? {
+type Serialize<T> = T extends unstable_SerializesTo<infer To> ? To : T extends Serializable ? T : T extends (...args: any[]) => unknown ? undefined : T extends Promise<infer U> ? Promise<Serialize<U>> : T extends Map<infer K, infer V> ? Map<Serialize<K>, Serialize<V>> : T extends ReadonlyMap<infer K, infer V> ? ReadonlyMap<Serialize<K>, Serialize<V>> : T extends Set<infer U> ? Set<Serialize<U>> : T extends ReadonlySet<infer U> ? ReadonlySet<Serialize<U>> : T extends [] ? [] : T extends readonly [infer F, ...infer R] ? [Serialize<F>, ...Serialize<R>] : T extends Array<infer U> ? Array<Serialize<U>> : T extends readonly unknown[] ? readonly Serialize<T[number]>[] : T extends Record<any, any> ? {
     [K in keyof T]: Serialize<T[K]>;
 } : undefined;
 type VoidToUndefined<T> = Equal<T, void> extends true ? undefined : T;

package/dist/development/index-react-server.js

@@ -27,7 +27,7 @@ function _interopNamespace(e) {
 var React2__namespace = /*#__PURE__*/_interopNamespace(React2);
 
 /**
- * react-router v7.8.1
+ * react-router v7.8.2-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -760,7 +760,7 @@ function createStaticHandler(routes, opts) {
           },
           async () => {
             let res = await generateMiddlewareResponse(
-              async (revalidationRequest) => {
+              async (revalidationRequest, opts2 = {}) => {
                 let result2 = await queryImpl(
                   revalidationRequest,
                   location,
@@ -769,7 +769,7 @@ function createStaticHandler(routes, opts) {
                   dataStrategy || null,
                   skipLoaderErrorBubbling === true,
                   null,
-                  filterMatchesToLoad || null,
+                  "filterMatchesToLoad" in opts2 ? opts2.filterMatchesToLoad ?? null : null,
                   skipRevalidation === true
                 );
                 if (isResponse(result2)) {
@@ -1513,31 +1513,37 @@ async function defaultDataStrategy(args) {
   });
   return keyedResults;
 }
-async function runServerMiddlewarePipeline(args, handler, errorHandler) {
+function runServerMiddlewarePipeline(args, handler, errorHandler) {
+  return runMiddlewarePipeline(
+    args,
+    handler,
+    processResult,
+    isResponse,
+    errorHandler
+  );
+  function processResult(result) {
+    return isDataWithResponseInit(result) ? dataWithResponseInitToResponse(result) : result;
+  }
+}
+async function runMiddlewarePipeline(args, handler, processResult, isResult, errorHandler) {
   let { matches, request, params, context } = args;
   let tuples = matches.flatMap(
     (m) => m.route.unstable_middleware ? m.route.unstable_middleware.map((fn) => [m.route.id, fn]) : []
   );
-  let result = await callServerRouteMiddleware(
+  let result = await callRouteMiddleware(
     { request, params, context },
     tuples,
     handler,
+    processResult,
+    isResult,
     errorHandler
   );
-  if (isResponse(result)) {
-    return result;
-  }
-  invariant(false, `Expected a Response to be returned from route middleware`);
+  return result;
 }
-async function callServerRouteMiddleware(args, middlewares, handler, errorHandler, idx = 0) {
+async function callRouteMiddleware(args, middlewares, handler, processResult, isResult, errorHandler, idx = 0) {
   let { request } = args;
   if (request.signal.aborted) {
-    if (request.signal.reason) {
-      throw request.signal.reason;
-    }
-    throw new Error(
-      `Request aborted without an \`AbortSignal.reason\`: ${request.method} ${request.url}`
-    );
+    throw request.signal.reason ?? new Error(`Request aborted: ${request.method} ${request.url}`);
   }
   let tuple = middlewares[idx];
   if (!tuple) {
@@ -1545,53 +1551,41 @@ async function callServerRouteMiddleware(args, middlewares, handler, errorHandle
     return result;
   }
   let [routeId, middleware] = tuple;
-  let nextCalled = false;
-  let nextResult = void 0;
+  let nextResult;
   let next = async () => {
-    if (nextCalled) {
+    if (nextResult) {
       throw new Error("You may only call `next()` once per middleware");
     }
-    nextCalled = true;
     try {
-      let result = await callServerRouteMiddleware(
+      let result = await callRouteMiddleware(
         args,
         middlewares,
         handler,
+        processResult,
+        isResult,
         errorHandler,
         idx + 1
       );
-      if (isDataWithResponseInit(result)) {
-        result = dataWithResponseInitToResponse(result);
-      }
-      nextResult = result;
-      return nextResult;
-    } catch (e) {
-      nextResult = await errorHandler(e, routeId);
-      return nextResult;
+      nextResult = { value: result };
+      return nextResult.value;
+    } catch (error) {
+      nextResult = { value: await errorHandler(error, routeId, nextResult) };
+      return nextResult.value;
     }
   };
   try {
-    let result = await middleware(
-      {
-        request: args.request,
-        params: args.params,
-        context: args.context
-      },
-      next
-    );
-    if (isDataWithResponseInit(result)) {
-      result = dataWithResponseInitToResponse(result);
-    }
-    if (nextCalled) {
-      return typeof result === "undefined" ? nextResult : result;
-    } else if (isResponse(result)) {
+    let value = await middleware(args, next);
+    let result = value != null ? processResult(value) : void 0;
+    if (isResult(result)) {
       return result;
+    } else if (nextResult) {
+      return result ?? nextResult.value;
     } else {
-      nextResult = await next();
-      return nextResult;
+      nextResult = { value: await next() };
+      return nextResult.value;
     }
-  } catch (e) {
-    let response = await errorHandler(e, routeId);
+  } catch (error) {
+    let response = await errorHandler(error, routeId, nextResult);
     return response;
   }
 }
@@ -2339,9 +2333,13 @@ async function processServerAction(request, basename, decodeReply, loadServerAct
       }
       onError?.(error);
     }
+    let maybeFormData = actionArgs.length === 1 ? actionArgs[0] : actionArgs[1];
+    let formData = maybeFormData && typeof maybeFormData === "object" && maybeFormData instanceof FormData ? maybeFormData : null;
+    let skipRevalidation = formData?.has("$SKIP_REVALIDATION") ?? false;
     return {
       actionResult,
-      revalidationRequest: getRevalidationRequest()
+      revalidationRequest: getRevalidationRequest(),
+      skipRevalidation
     };
   } else if (isFormRequest) {
     const formData = await request.clone().formData();
@@ -2370,7 +2368,8 @@ async function processServerAction(request, basename, decodeReply, loadServerAct
       }
       return {
         formState,
-        revalidationRequest: getRevalidationRequest()
+        revalidationRequest: getRevalidationRequest(),
+        skipRevalidation: false
       };
     }
   }
@@ -2444,9 +2443,12 @@ async function generateRenderResponse(request, routes, basename, isDataRequest,
       requestContext,
       skipLoaderErrorBubbling: isDataRequest,
       skipRevalidation: isSubmission,
-      ...routeIdsToLoad ? { filterMatchesToLoad: (m) => routeIdsToLoad.includes(m.route.id) } : null,
+      ...routeIdsToLoad ? {
+        filterMatchesToLoad: (m) => routeIdsToLoad.includes(m.route.id)
+      } : {},
       async unstable_generateMiddlewareResponse(query) {
         let formState;
+        let skipRevalidation = false;
         if (request.method === "POST") {
           ctx.runningAction = true;
           let result2 = await processServerAction(
@@ -2471,6 +2473,7 @@ async function generateRenderResponse(request, routes, basename, isDataRequest,
               ctx.redirect?.headers
             );
           }
+          skipRevalidation = result2?.skipRevalidation ?? false;
           actionResult = result2?.actionResult;
           formState = result2?.formState;
           request = result2?.revalidationRequest ?? request;
@@ -2486,7 +2489,12 @@ async function generateRenderResponse(request, routes, basename, isDataRequest,
             );
           }
         }
-        let staticContext = await query(request);
+        let staticContext = await query(
+          request,
+          skipRevalidation ? {
+            filterMatchesToLoad: () => false
+          } : void 0
+        );
         if (isResponse(staticContext)) {
           return generateRedirectResponse(
             staticContext,
@@ -2510,6 +2518,7 @@ async function generateRenderResponse(request, routes, basename, isDataRequest,
           formState,
           staticContext,
           temporaryReferences,
+          skipRevalidation,
           ctx.redirect?.headers
         );
       }
@@ -2561,7 +2570,7 @@ function generateRedirectResponse(response, actionResult, basename, isDataReques
     { temporaryReferences }
   );
 }
-async function generateStaticContextResponse(routes, basename, generateResponse, statusCode, routeIdsToLoad, isDataRequest, isSubmission, actionResult, formState, staticContext, temporaryReferences, sideEffectRedirectHeaders) {
+async function generateStaticContextResponse(routes, basename, generateResponse, statusCode, routeIdsToLoad, isDataRequest, isSubmission, actionResult, formState, staticContext, temporaryReferences, skipRevalidation, sideEffectRedirectHeaders) {
   statusCode = staticContext.statusCode ?? statusCode;
   if (staticContext.errors) {
     staticContext.errors = Object.fromEntries(
@@ -2608,7 +2617,7 @@ async function generateStaticContextResponse(routes, basename, generateResponse,
     payload = {
       type: "action",
       actionResult,
-      rerender: renderPayloadPromise()
+      rerender: skipRevalidation ? void 0 : renderPayloadPromise()
     };
   } else if (isSubmission && isDataRequest) {
     payload = {

package/dist/development/index-react-server.mjs

@@ -6,7 +6,7 @@ export { Await, BrowserRouter, Form, HashRouter, Link, Links, MemoryRouter, Meta
 import { serialize, parse } from 'cookie';
 
 /**
- * react-router v7.8.1
+ * react-router v7.8.2-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -739,7 +739,7 @@ function createStaticHandler(routes, opts) {
           },
           async () => {
             let res = await generateMiddlewareResponse(
-              async (revalidationRequest) => {
+              async (revalidationRequest, opts2 = {}) => {
                 let result2 = await queryImpl(
                   revalidationRequest,
                   location,
@@ -748,7 +748,7 @@ function createStaticHandler(routes, opts) {
                   dataStrategy || null,
                   skipLoaderErrorBubbling === true,
                   null,
-                  filterMatchesToLoad || null,
+                  "filterMatchesToLoad" in opts2 ? opts2.filterMatchesToLoad ?? null : null,
                   skipRevalidation === true
                 );
                 if (isResponse(result2)) {
@@ -1492,31 +1492,37 @@ async function defaultDataStrategy(args) {
   });
   return keyedResults;
 }
-async function runServerMiddlewarePipeline(args, handler, errorHandler) {
+function runServerMiddlewarePipeline(args, handler, errorHandler) {
+  return runMiddlewarePipeline(
+    args,
+    handler,
+    processResult,
+    isResponse,
+    errorHandler
+  );
+  function processResult(result) {
+    return isDataWithResponseInit(result) ? dataWithResponseInitToResponse(result) : result;
+  }
+}
+async function runMiddlewarePipeline(args, handler, processResult, isResult, errorHandler) {
   let { matches, request, params, context } = args;
   let tuples = matches.flatMap(
     (m) => m.route.unstable_middleware ? m.route.unstable_middleware.map((fn) => [m.route.id, fn]) : []
   );
-  let result = await callServerRouteMiddleware(
+  let result = await callRouteMiddleware(
     { request, params, context },
     tuples,
     handler,
+    processResult,
+    isResult,
     errorHandler
   );
-  if (isResponse(result)) {
-    return result;
-  }
-  invariant(false, `Expected a Response to be returned from route middleware`);
+  return result;
 }
-async function callServerRouteMiddleware(args, middlewares, handler, errorHandler, idx = 0) {
+async function callRouteMiddleware(args, middlewares, handler, processResult, isResult, errorHandler, idx = 0) {
   let { request } = args;
   if (request.signal.aborted) {
-    if (request.signal.reason) {
-      throw request.signal.reason;
-    }
-    throw new Error(
-      `Request aborted without an \`AbortSignal.reason\`: ${request.method} ${request.url}`
-    );
+    throw request.signal.reason ?? new Error(`Request aborted: ${request.method} ${request.url}`);
   }
   let tuple = middlewares[idx];
   if (!tuple) {
@@ -1524,53 +1530,41 @@ async function callServerRouteMiddleware(args, middlewares, handler, errorHandle
     return result;
   }
   let [routeId, middleware] = tuple;
-  let nextCalled = false;
-  let nextResult = void 0;
+  let nextResult;
   let next = async () => {
-    if (nextCalled) {
+    if (nextResult) {
       throw new Error("You may only call `next()` once per middleware");
     }
-    nextCalled = true;
     try {
-      let result = await callServerRouteMiddleware(
+      let result = await callRouteMiddleware(
         args,
         middlewares,
         handler,
+        processResult,
+        isResult,
         errorHandler,
         idx + 1
       );
-      if (isDataWithResponseInit(result)) {
-        result = dataWithResponseInitToResponse(result);
-      }
-      nextResult = result;
-      return nextResult;
-    } catch (e) {
-      nextResult = await errorHandler(e, routeId);
-      return nextResult;
+      nextResult = { value: result };
+      return nextResult.value;
+    } catch (error) {
+      nextResult = { value: await errorHandler(error, routeId, nextResult) };
+      return nextResult.value;
     }
   };
   try {
-    let result = await middleware(
-      {
-        request: args.request,
-        params: args.params,
-        context: args.context
-      },
-      next
-    );
-    if (isDataWithResponseInit(result)) {
-      result = dataWithResponseInitToResponse(result);
-    }
-    if (nextCalled) {
-      return typeof result === "undefined" ? nextResult : result;
-    } else if (isResponse(result)) {
+    let value = await middleware(args, next);
+    let result = value != null ? processResult(value) : void 0;
+    if (isResult(result)) {
       return result;
+    } else if (nextResult) {
+      return result ?? nextResult.value;
     } else {
-      nextResult = await next();
-      return nextResult;
+      nextResult = { value: await next() };
+      return nextResult.value;
     }
-  } catch (e) {
-    let response = await errorHandler(e, routeId);
+  } catch (error) {
+    let response = await errorHandler(error, routeId, nextResult);
     return response;
   }
 }
@@ -2318,9 +2312,13 @@ async function processServerAction(request, basename, decodeReply, loadServerAct
       }
       onError?.(error);
     }
+    let maybeFormData = actionArgs.length === 1 ? actionArgs[0] : actionArgs[1];
+    let formData = maybeFormData && typeof maybeFormData === "object" && maybeFormData instanceof FormData ? maybeFormData : null;
+    let skipRevalidation = formData?.has("$SKIP_REVALIDATION") ?? false;
     return {
       actionResult,
-      revalidationRequest: getRevalidationRequest()
+      revalidationRequest: getRevalidationRequest(),
+      skipRevalidation
     };
   } else if (isFormRequest) {
     const formData = await request.clone().formData();
@@ -2349,7 +2347,8 @@ async function processServerAction(request, basename, decodeReply, loadServerAct
       }
       return {
         formState,
-        revalidationRequest: getRevalidationRequest()
+        revalidationRequest: getRevalidationRequest(),
+        skipRevalidation: false
       };
     }
   }
@@ -2423,9 +2422,12 @@ async function generateRenderResponse(request, routes, basename, isDataRequest,
       requestContext,
       skipLoaderErrorBubbling: isDataRequest,
       skipRevalidation: isSubmission,
-      ...routeIdsToLoad ? { filterMatchesToLoad: (m) => routeIdsToLoad.includes(m.route.id) } : null,
+      ...routeIdsToLoad ? {
+        filterMatchesToLoad: (m) => routeIdsToLoad.includes(m.route.id)
+      } : {},
       async unstable_generateMiddlewareResponse(query) {
         let formState;
+        let skipRevalidation = false;
         if (request.method === "POST") {
           ctx.runningAction = true;
           let result2 = await processServerAction(
@@ -2450,6 +2452,7 @@ async function generateRenderResponse(request, routes, basename, isDataRequest,
               ctx.redirect?.headers
             );
           }
+          skipRevalidation = result2?.skipRevalidation ?? false;
           actionResult = result2?.actionResult;
           formState = result2?.formState;
           request = result2?.revalidationRequest ?? request;
@@ -2465,7 +2468,12 @@ async function generateRenderResponse(request, routes, basename, isDataRequest,
             );
           }
         }
-        let staticContext = await query(request);
+        let staticContext = await query(
+          request,
+          skipRevalidation ? {
+            filterMatchesToLoad: () => false
+          } : void 0
+        );
         if (isResponse(staticContext)) {
           return generateRedirectResponse(
             staticContext,
@@ -2489,6 +2497,7 @@ async function generateRenderResponse(request, routes, basename, isDataRequest,
           formState,
           staticContext,
           temporaryReferences,
+          skipRevalidation,
           ctx.redirect?.headers
         );
       }
@@ -2540,7 +2549,7 @@ function generateRedirectResponse(response, actionResult, basename, isDataReques
     { temporaryReferences }
   );
 }
-async function generateStaticContextResponse(routes, basename, generateResponse, statusCode, routeIdsToLoad, isDataRequest, isSubmission, actionResult, formState, staticContext, temporaryReferences, sideEffectRedirectHeaders) {
+async function generateStaticContextResponse(routes, basename, generateResponse, statusCode, routeIdsToLoad, isDataRequest, isSubmission, actionResult, formState, staticContext, temporaryReferences, skipRevalidation, sideEffectRedirectHeaders) {
   statusCode = staticContext.statusCode ?? statusCode;
   if (staticContext.errors) {
     staticContext.errors = Object.fromEntries(
@@ -2587,7 +2596,7 @@ async function generateStaticContextResponse(routes, basename, generateResponse,
     payload = {
       type: "action",
       actionResult,
-      rerender: renderPayloadPromise()
+      rerender: skipRevalidation ? void 0 : renderPayloadPromise()
     };
   } else if (isSubmission && isDataRequest) {
     payload = {