Revert functional changes

Author: brophdawg11

packages/react-router/lib/router/router.ts

@@ -437,7 +437,6 @@ export interface StaticHandler {
           r: Request,
           args?: {
             filterMatchesToLoad?: (match: AgnosticDataRouteMatch) => boolean;
-            skipRevalidation?: boolean;
           },
         ) => Promise<StaticHandlerContext | Response>,
       ) => MaybePromise<Response>;
@@ -3558,7 +3557,7 @@ export function createStaticHandler(
       skipLoaderErrorBubbling,
       skipRevalidation,
       dataStrategy,
-      generateMiddlewareResponse,
+      generateMiddlewareResponse: generateMiddlewareResponse,
     }: Parameters<StaticHandler["query"]>[1] = {},
   ): Promise<StaticHandlerContext | Response> {
     let url = new URL(request.url);
@@ -3626,7 +3625,6 @@ export function createStaticHandler(
     //    redirects from loaders after a server action, etc.
     //    - If we decide this isn't warranted than the stream implementation
     //      can simplify and potentially even collapse back into respond()
-
     if (generateMiddlewareResponse) {
       invariant(
         requestContext instanceof RouterContextProvider,
@@ -3657,7 +3655,6 @@ export function createStaticHandler(
                   filterMatchesToLoad?:
                     | ((match: AgnosticDataRouteMatch) => boolean)
                     | undefined;
-                  skipRevalidation?: boolean;
                 } = {},
               ) => {
                 let result = await queryImpl(
@@ -3671,7 +3668,7 @@ export function createStaticHandler(
                   "filterMatchesToLoad" in opts
                     ? (opts.filterMatchesToLoad ?? null)
                     : null,
-                  opts?.skipRevalidation ?? skipRevalidation === true,
+                  skipRevalidation === true,
                 );
 
                 if (isResponse(result)) {
@@ -3834,7 +3831,7 @@ export function createStaticHandler(
       routeId,
       requestContext,
       dataStrategy,
-      generateMiddlewareResponse,
+      generateMiddlewareResponse: generateMiddlewareResponse,
     }: Parameters<StaticHandler["queryRoute"]>[1] = {},
   ): Promise<any> {
     let url = new URL(request.url);

packages/react-router/lib/server-runtime/single-fetch.ts

@@ -144,15 +144,10 @@ export async function singleFetchLoaders(
       requestContext: loadContext,
       filterMatchesToLoad: (m) => !loadRouteIds || loadRouteIds.has(m.route.id),
       skipLoaderErrorBubbling: true,
-      skipRevalidation: true,
       generateMiddlewareResponse: build.future.v8_middleware
         ? async (query) => {
             try {
-              let innerResult = await query(handlerRequest, {
-                filterMatchesToLoad: (m) =>
-                  !loadRouteIds || loadRouteIds.has(m.route.id),
-                skipRevalidation: true,
-              });
+              let innerResult = await query(handlerRequest);
               return handleQueryResult(innerResult);
             } catch (error) {
               return handleQueryError(error);