react-router 0.0.0-experimental-84753c0 → 0.0.0-experimental-14dc7c1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # `react-router`
 
+## 7.7.1
+
+### Patch Changes
+
+- In RSC Data Mode, fix bug where routes with errors weren't forced to revalidate when `shouldRevalidate` returned false ([#14026](https://github.com/remix-run/react-router/pull/14026))
+- In RSC Data Mode, fix `Matched leaf route at location "/..." does not have an element or Component` warnings when error boundaries are rendered. ([#14021](https://github.com/remix-run/react-router/pull/14021))
+
 ## 7.7.0
 
 ### Minor Changes

package/dist/development/{chunk-7BNQ3X22.mjs → chunk-7DQFGJJ6.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-84753c0
+ * react-router v0.0.0-experimental-14dc7c1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -489,6 +489,7 @@ function convertRouteMatchToUiMatch(match, loaderData) {
     pathname,
     params,
     data: loaderData[route.id],
+    loaderData: loaderData[route.id],
     handle: route.handle
   };
 }
@@ -1434,9 +1435,7 @@ function createRouter(init) {
       pendingNavigationController.signal,
       opts && opts.submission
     );
-    let scopedContext = new unstable_RouterContextProvider(
-      init.unstable_getContext ? await init.unstable_getContext() : void 0
-    );
+    let scopedContext = init.unstable_getContext ? await init.unstable_getContext() : new unstable_RouterContextProvider();
     let pendingActionResult;
     if (opts && opts.pendingError) {
       pendingActionResult = [
@@ -1857,9 +1856,7 @@ function createRouter(init) {
       setFetcherError(key, routeId, error, { flushSync });
       return;
     }
-    let scopedContext = new unstable_RouterContextProvider(
-      init.unstable_getContext ? await init.unstable_getContext() : void 0
-    );
+    let scopedContext = init.unstable_getContext ? await init.unstable_getContext() : new unstable_RouterContextProvider();
     let preventScrollReset = (opts && opts.preventScrollReset) === true;
     if (submission && isMutationMethod(submission.formMethod)) {
       await handleFetcherAction(
@@ -2718,7 +2715,7 @@ function createStaticHandler(routes, opts) {
     let location = createLocation("", createPath(url), null, "default");
     let matches = matchRoutes(dataRoutes, location, basename);
     requestContext = requestContext != null ? requestContext : new unstable_RouterContextProvider();
-    let respondOrStreamStaticContext = (ctx) => {
+    let shortCircuitResult = (ctx) => {
       return stream ? stream(
         requestContext,
         () => Promise.resolve(ctx)
@@ -2740,7 +2737,7 @@ function createStaticHandler(routes, opts) {
         loaderHeaders: {},
         actionHeaders: {}
       };
-      return respondOrStreamStaticContext(staticContext);
+      return shortCircuitResult(staticContext);
     } else if (!matches) {
       let error = getInternalRouterError(404, { pathname: location.pathname });
       let { matches: notFoundMatches, route } = getShortCircuitMatches(dataRoutes);
@@ -2757,7 +2754,7 @@ function createStaticHandler(routes, opts) {
         loaderHeaders: {},
         actionHeaders: {}
       };
-      return respondOrStreamStaticContext(staticContext);
+      return shortCircuitResult(staticContext);
     }
     if (stream || respond && matches.some(
       (m) => m.route.unstable_middleware || typeof m.route.lazy === "object" && m.route.lazy.unstable_middleware
@@ -2837,7 +2834,7 @@ function createStaticHandler(routes, opts) {
                 error,
                 skipLoaderErrorBubbling ? routeId : findNearestBoundary(matches, routeId).route.id
               );
-              return respondOrStreamStaticContext(staticContext);
+              return stream ? stream(requestContext, () => Promise.resolve(staticContext)) : respond(staticContext);
             } else {
               let boundaryRouteId = skipLoaderErrorBubbling ? routeId : findNearestBoundary(
                 matches,
@@ -2858,7 +2855,7 @@ function createStaticHandler(routes, opts) {
                 actionHeaders: {},
                 loaderHeaders: {}
               };
-              return respondOrStreamStaticContext(staticContext);
+              return stream ? stream(requestContext, () => Promise.resolve(staticContext)) : respond(staticContext);
             }
           }
         );
@@ -2891,7 +2888,8 @@ function createStaticHandler(routes, opts) {
     routeId,
     requestContext,
     dataStrategy,
-    unstable_respond: respond
+    unstable_respond: respond,
+    unstable_stream: stream
   } = {}) {
     let url = new URL(request.url);
     let method = request.method;
@@ -2912,7 +2910,7 @@ function createStaticHandler(routes, opts) {
     } else if (!match) {
       throw getInternalRouterError(404, { pathname: location.pathname });
     }
-    if (respond && matches.some(
+    if (stream || respond && matches.some(
       (m) => m.route.unstable_middleware || typeof m.route.lazy === "object" && m.route.lazy.unstable_middleware
     )) {
       invariant(
@@ -2931,6 +2929,35 @@ function createStaticHandler(routes, opts) {
         },
         true,
         async () => {
+          if (stream) {
+            let res = await stream(
+              requestContext,
+              async (revalidationRequest) => {
+                let result3 = await queryImpl(
+                  revalidationRequest,
+                  location,
+                  matches,
+                  requestContext,
+                  dataStrategy || null,
+                  false,
+                  match,
+                  null,
+                  false
+                );
+                if (isResponse(result3)) {
+                  return result3;
+                }
+                let error3 = result3.errors ? Object.values(result3.errors)[0] : void 0;
+                if (error3 !== void 0) {
+                  throw error3;
+                }
+                let value2 = result3.actionData ? Object.values(result3.actionData)[0] : Object.values(result3.loaderData)[0];
+                return typeof value2 === "string" ? new Response(value2) : Response.json(value2);
+              }
+            );
+            return res;
+          }
+          invariant(respond, "Expected respond to be defined");
           let result2 = await queryImpl(
             request,
             location,
@@ -2950,16 +2977,15 @@ function createStaticHandler(routes, opts) {
             throw error2;
           }
           let value = result2.actionData ? Object.values(result2.actionData)[0] : Object.values(result2.loaderData)[0];
-          return typeof value === "string" ? new Response(value) : Response.json(value);
+          return respond(
+            typeof value === "string" ? new Response(value) : Response.json(value)
+          );
         },
         (error2) => {
           if (isResponse(error2)) {
-            return respond(error2);
+            return respond ? respond(error2) : error2;
           }
-          return new Response(String(error2), {
-            status: 500,
-            statusText: "Unexpected Server Error"
-          });
+          throw error2;
         }
       );
       return response;
@@ -3951,7 +3977,22 @@ async function runMiddlewarePipeline(args, propagateResult, handler, errorHandle
       middlewareState,
       handler
     );
-    return propagateResult ? result : middlewareState.handlerResult;
+    if (propagateResult) {
+      invariant(
+        isResponse(result) || isDataWithResponseInit(result),
+        `Expected a Response to be returned from route middleware`
+      );
+      if (isDataWithResponseInit(result)) {
+        return new Response(
+          typeof result.data === "string" ? result.data : JSON.stringify(result.data),
+          { ...result.init }
+        );
+      } else {
+        return result;
+      }
+    } else {
+      return middlewareState.handlerResult;
+    }
   } catch (e) {
     if (!middlewareState.middlewareError) {
       throw e;
@@ -4011,14 +4052,25 @@ async function callRouteMiddleware(args, middlewares, propagateResult, middlewar
       },
       next
     );
-    if (nextCalled) {
-      if (result === void 0) {
-        return nextResult;
-      } else {
+    if (propagateResult) {
+      if (nextCalled) {
+        return typeof result === "undefined" ? nextResult : result;
+      } else if (isResponse(result) || isDataWithResponseInit(result)) {
         return result;
+      } else {
+        nextResult = await next();
+        return nextResult;
       }
     } else {
-      return next();
+      if (typeof result !== "undefined") {
+        console.warn(
+          "client middlewares are not intended to return values, the value will be ignored",
+          result
+        );
+      }
+      if (!nextCalled) {
+        await next();
+      }
     }
   } catch (error) {
     if (!middlewareState.middlewareError) {
@@ -7366,6 +7418,34 @@ import * as React9 from "react";
 // lib/dom/ssr/components.tsx
 import * as React8 from "react";
 
+// lib/dom/ssr/routeModules.ts
+async function loadRouteModule(route, routeModulesCache) {
+  if (route.id in routeModulesCache) {
+    return routeModulesCache[route.id];
+  }
+  try {
+    let routeModule = await import(
+      /* @vite-ignore */
+      /* webpackIgnore: true */
+      route.module
+    );
+    routeModulesCache[route.id] = routeModule;
+    return routeModule;
+  } catch (error) {
+    console.error(
+      `Error loading route module \`${route.module}\`, reloading page...`
+    );
+    console.error(error);
+    if (window.__reactRouterContext && window.__reactRouterContext.isSpaMode && // @ts-expect-error
+    import.meta.hot) {
+      throw error;
+    }
+    window.location.reload();
+    return new Promise(() => {
+    });
+  }
+}
+
 // lib/dom/ssr/links.ts
 function getKeyedLinksForMatches(matches, routeModules, manifest) {
   let descriptors = matches.map((match) => {
@@ -7447,7 +7527,7 @@ function isHtmlLinkDescriptor(object) {
   }
   return typeof object.rel === "string" && typeof object.href === "string";
 }
-async function getKeyedPrefetchLinks(matches, manifest, routeModules, loadRouteModule) {
+async function getKeyedPrefetchLinks(matches, manifest, routeModules) {
   let links = await Promise.all(
     matches.map(async (match) => {
       let route = manifest.routes[match.route.id];
@@ -7670,14 +7750,13 @@ function createServerRoutes(manifest, routeModules, future, isSpaMode, parentId
     return dataRoute;
   });
 }
-function createClientRoutesWithHMRRevalidationOptOut(needsRevalidation, manifest, routeModulesCache, initialState, ssr, isSpaMode, loadRouteModule) {
+function createClientRoutesWithHMRRevalidationOptOut(needsRevalidation, manifest, routeModulesCache, initialState, ssr, isSpaMode) {
   return createClientRoutes(
     manifest,
     routeModulesCache,
     initialState,
     ssr,
     isSpaMode,
-    loadRouteModule,
     "",
     groupRoutesByParentId(manifest),
     needsRevalidation
@@ -7697,7 +7776,7 @@ function noActionDefinedError(type, routeId) {
   console.error(msg);
   throw new ErrorResponseImpl(405, "Method Not Allowed", new Error(msg), true);
 }
-function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSpaMode, loadRouteModule, parentId = "", routesByParentId = groupRoutesByParentId(manifest), needsRevalidation) {
+function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSpaMode, parentId = "", routesByParentId = groupRoutesByParentId(manifest), needsRevalidation) {
   return (routesByParentId[parentId] || []).map((route) => {
     let routeModule = routeModulesCache[route.id];
     function fetchServerHandler(singleFetch) {
@@ -7852,8 +7931,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
           }
           let routeModulePromise = loadRouteModuleWithBlockingLinks(
             route,
-            routeModulesCache,
-            loadRouteModule
+            routeModulesCache
           );
           prefetchRouteModuleChunks(route);
           return await routeModulePromise;
@@ -7928,7 +8006,6 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
       initialState,
       ssr,
       isSpaMode,
-      loadRouteModule,
       route.id,
       routesByParentId,
       needsRevalidation
@@ -7974,7 +8051,7 @@ function wrapShouldRevalidateForHdr(routeId, routeShouldRevalidate, needsRevalid
     return routeShouldRevalidate ? routeShouldRevalidate(arg) : arg.defaultShouldRevalidate;
   };
 }
-async function loadRouteModuleWithBlockingLinks(route, routeModules, loadRouteModule) {
+async function loadRouteModuleWithBlockingLinks(route, routeModules) {
   let routeModulePromise = loadRouteModule(route, routeModules);
   let prefetchRouteCssPromise = prefetchRouteCss(route);
   let routeModule = await routeModulePromise;
@@ -8038,7 +8115,7 @@ function getPartialManifest({ sri, ...manifest }, router) {
     sri: sri ? true : void 0
   };
 }
-function getPatchRoutesOnNavigationFunction(manifest, routeModules, ssr, routeDiscovery, isSpaMode, basename, loadRouteModule) {
+function getPatchRoutesOnNavigationFunction(manifest, routeModules, ssr, routeDiscovery, isSpaMode, basename) {
   if (!isFogOfWarEnabled(routeDiscovery, ssr)) {
     return void 0;
   }
@@ -8053,7 +8130,6 @@ function getPatchRoutesOnNavigationFunction(manifest, routeModules, ssr, routeDi
       routeModules,
       ssr,
       isSpaMode,
-      loadRouteModule,
       basename,
       routeDiscovery.manifestPath,
       patch,
@@ -8061,7 +8137,7 @@ function getPatchRoutesOnNavigationFunction(manifest, routeModules, ssr, routeDi
     );
   };
 }
-function useFogOFWarDiscovery(router, manifest, routeModules, ssr, routeDiscovery, isSpaMode, loadRouteModule) {
+function useFogOFWarDiscovery(router, manifest, routeModules, ssr, routeDiscovery, isSpaMode) {
   React7.useEffect(() => {
     if (!isFogOfWarEnabled(routeDiscovery, ssr) || // @ts-expect-error - TS doesn't know about this yet
     window.navigator?.connection?.saveData === true) {
@@ -8097,7 +8173,6 @@ function useFogOFWarDiscovery(router, manifest, routeModules, ssr, routeDiscover
           routeModules,
           ssr,
           isSpaMode,
-          loadRouteModule,
           router.basename,
           routeDiscovery.manifestPath,
           router.patchRoutes
@@ -8116,15 +8191,7 @@ function useFogOFWarDiscovery(router, manifest, routeModules, ssr, routeDiscover
       attributeFilter: ["data-discover", "href", "action"]
     });
     return () => observer.disconnect();
-  }, [
-    ssr,
-    isSpaMode,
-    manifest,
-    routeModules,
-    router,
-    routeDiscovery,
-    loadRouteModule
-  ]);
+  }, [ssr, isSpaMode, manifest, routeModules, router, routeDiscovery]);
 }
 function getManifestPath(_manifestPath, basename) {
   let manifestPath = _manifestPath || "/__manifest";
@@ -8134,13 +8201,15 @@ function getManifestPath(_manifestPath, basename) {
   return `${basename}${manifestPath}`.replace(/\/+/g, "/");
 }
 var MANIFEST_VERSION_STORAGE_KEY = "react-router-manifest-version";
-async function fetchAndApplyManifestPatches(paths, errorReloadPath, manifest, routeModules, ssr, isSpaMode, loadRouteModule, basename, manifestPath, patchRoutes, signal) {
+async function fetchAndApplyManifestPatches(paths, errorReloadPath, manifest, routeModules, ssr, isSpaMode, basename, manifestPath, patchRoutes, signal) {
+  const searchParams = new URLSearchParams();
+  paths.sort().forEach((path) => searchParams.append("p", path));
+  searchParams.set("version", manifest.version);
   let url = new URL(
     getManifestPath(manifestPath, basename),
     window.location.origin
   );
-  paths.sort().forEach((path) => url.searchParams.append("p", path));
-  url.searchParams.set("version", manifest.version);
+  url.search = searchParams.toString();
   if (url.toString().length > URL_LIMIT) {
     nextPaths.clear();
     return;
@@ -8195,15 +8264,7 @@ async function fetchAndApplyManifestPatches(paths, errorReloadPath, manifest, ro
   parentIds.forEach(
     (parentId) => patchRoutes(
       parentId || null,
-      createClientRoutes(
-        patches,
-        routeModules,
-        null,
-        ssr,
-        isSpaMode,
-        loadRouteModule,
-        parentId
-      )
+      createClientRoutes(patches, routeModules, null, ssr, isSpaMode, parentId)
     )
   );
 }
@@ -8326,7 +8387,7 @@ function getActiveMatches(matches, errors, isSpaMode) {
   return matches;
 }
 var CRITICAL_CSS_DATA_ATTRIBUTE = "data-react-router-critical-css";
-function Links() {
+function Links({ nonce }) {
   let { isSpaMode, manifest, routeModules, criticalCss } = useFrameworkContext();
   let { errors, matches: routerMatches } = useDataRouterStateContext();
   let matches = getActiveMatches(routerMatches, errors, isSpaMode);
@@ -8345,10 +8406,11 @@ function Links() {
     {
       ...{ [CRITICAL_CSS_DATA_ATTRIBUTE]: "" },
       rel: "stylesheet",
-      href: criticalCss.href
+      href: criticalCss.href,
+      nonce
     }
   ) : null, keyedLinks.map(
-    ({ key, link }) => isPageLinkDescriptor(link) ? /* @__PURE__ */ React8.createElement(PrefetchPageLinks, { key, ...link }) : /* @__PURE__ */ React8.createElement("link", { key, ...link })
+    ({ key, link }) => isPageLinkDescriptor(link) ? /* @__PURE__ */ React8.createElement(PrefetchPageLinks, { key, nonce, ...link }) : /* @__PURE__ */ React8.createElement("link", { key, nonce, ...link })
   ));
 }
 function PrefetchPageLinks({ page, ...linkProps }) {
@@ -8363,24 +8425,21 @@ function PrefetchPageLinks({ page, ...linkProps }) {
   return /* @__PURE__ */ React8.createElement(PrefetchPageLinksImpl, { page, matches, ...linkProps });
 }
 function useKeyedPrefetchLinks(matches) {
-  let { manifest, routeModules, loadRouteModule } = useFrameworkContext();
+  let { manifest, routeModules } = useFrameworkContext();
   let [keyedPrefetchLinks, setKeyedPrefetchLinks] = React8.useState([]);
   React8.useEffect(() => {
     let interrupted = false;
-    void getKeyedPrefetchLinks(
-      matches,
-      manifest,
-      routeModules,
-      loadRouteModule
-    ).then((links) => {
-      if (!interrupted) {
-        setKeyedPrefetchLinks(links);
+    void getKeyedPrefetchLinks(matches, manifest, routeModules).then(
+      (links) => {
+        if (!interrupted) {
+          setKeyedPrefetchLinks(links);
+        }
       }
-    });
+    );
     return () => {
       interrupted = true;
     };
-  }, [matches, manifest, routeModules, loadRouteModule]);
+  }, [matches, manifest, routeModules]);
   return keyedPrefetchLinks;
 }
 function PrefetchPageLinksImpl({
@@ -8462,7 +8521,7 @@ function PrefetchPageLinksImpl({
   return /* @__PURE__ */ React8.createElement(React8.Fragment, null, dataHrefs.map((href) => /* @__PURE__ */ React8.createElement("link", { key: href, rel: "prefetch", as: "fetch", href, ...linkProps })), moduleHrefs.map((href) => /* @__PURE__ */ React8.createElement("link", { key: href, rel: "modulepreload", href, ...linkProps })), keyedPrefetchLinks.map(({ key, link }) => (
     // these don't spread `linkProps` because they are full link descriptors
     // already with their own props
-    /* @__PURE__ */ React8.createElement("link", { key, ...link })
+    /* @__PURE__ */ React8.createElement("link", { key, nonce: linkProps.nonce, ...link })
   )));
 }
 function Meta() {
@@ -8491,6 +8550,7 @@ function Meta() {
     let match = {
       id: routeId,
       data: data2,
+      loaderData: data2,
       meta: [],
       params: _match.params,
       pathname: _match.pathname,
@@ -8501,6 +8561,7 @@ function Meta() {
     if (routeModule?.meta) {
       routeMeta = typeof routeModule.meta === "function" ? routeModule.meta({
         data: data2,
+        loaderData: data2,
         params,
         location,
         matches,
@@ -8841,7 +8902,7 @@ var isBrowser = typeof window !== "undefined" && typeof window.document !== "und
 try {
   if (isBrowser) {
     window.__reactRouterVersion = // @ts-expect-error
-    "0.0.0-experimental-84753c0";
+    "0.0.0-experimental-14dc7c1";
   }
 } catch (e) {
 }

package/dist/development/{chunk-2XECXUWB.mjs → chunk-BP2L2QSJ.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-84753c0
+ * react-router v0.0.0-experimental-14dc7c1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -57,40 +57,10 @@ import {
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-7BNQ3X22.mjs";
+} from "./chunk-7DQFGJJ6.mjs";
 
 // lib/dom/ssr/server.tsx
 import * as React from "react";
-
-// lib/dom/ssr/routeModules.ts
-var defaultLoadRouteModule = async (route, routeModulesCache) => {
-  if (route.id in routeModulesCache) {
-    return routeModulesCache[route.id];
-  }
-  try {
-    let routeModule = await import(
-      /* @vite-ignore */
-      /* webpackIgnore: true */
-      route.module
-    );
-    routeModulesCache[route.id] = routeModule;
-    return routeModule;
-  } catch (error) {
-    console.error(
-      `Error loading route module \`${route.module}\`, reloading page...`
-    );
-    console.error(error);
-    if (window.__reactRouterContext && window.__reactRouterContext.isSpaMode && // @ts-expect-error
-    import.meta.hot) {
-      throw error;
-    }
-    window.location.reload();
-    return new Promise(() => {
-    });
-  }
-};
-
-// lib/dom/ssr/server.tsx
 function ServerRouter({
   context,
   url,
@@ -136,8 +106,7 @@ function ServerRouter({
         isSpaMode: context.isSpaMode,
         routeDiscovery: context.routeDiscovery,
         serializeError: context.serializeError,
-        renderMeta: context.renderMeta,
-        loadRouteModule: defaultLoadRouteModule
+        renderMeta: context.renderMeta
       }
     },
     /* @__PURE__ */ React.createElement(RemixErrorBoundary, { location: router.state.location }, /* @__PURE__ */ React.createElement(
@@ -167,8 +136,7 @@ function createRoutesStub(routes, _context) {
     initialEntries,
     initialIndex,
     hydrationData,
-    future,
-    loadRouteModule = defaultLoadRouteModule
+    future
   }) {
     let routerRef = React2.useRef();
     let frameworkContextRef = React2.useRef();
@@ -187,7 +155,6 @@ function createRoutesStub(routes, _context) {
         routeModules: {},
         ssr: false,
         isSpaMode: false,
-        loadRouteModule,
         routeDiscovery: { mode: "lazy", manifestPath: "/__manifest" }
       };
       let patched = processRoutes(
@@ -1107,23 +1074,14 @@ var createRequestHandler = (build, mode) => {
       });
     };
     if (_build.future.unstable_middleware) {
-      if (initialContext == null) {
-        loadContext = new unstable_RouterContextProvider();
-      } else {
-        try {
-          loadContext = new unstable_RouterContextProvider(
-            initialContext
-          );
-        } catch (e) {
-          let error = new Error(
-            `Unable to create initial \`unstable_RouterContextProvider\` instance. Please confirm you are returning an instance of \`Map<unstable_routerContext, unknown>\` from your \`getLoadContext\` function.
-
-Error: ${e instanceof Error ? e.toString() : e}`
-          );
-          handleError(error);
-          return returnLastResortErrorResponse(error, serverMode);
-        }
+      if (initialContext && !(initialContext instanceof unstable_RouterContextProvider)) {
+        let error = new Error(
+          "Invalid `context` value provided to `handleRequest`. When middleware is enabled you must return an instance of `unstable_RouterContextProvider` from your `getLoadContext` function."
+        );
+        handleError(error);
+        return returnLastResortErrorResponse(error, serverMode);
       }
+      loadContext = initialContext || new unstable_RouterContextProvider();
     } else {
       loadContext = initialContext || {};
     }
@@ -1394,8 +1352,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
       ssr: build.ssr,
       routeDiscovery: build.routeDiscovery,
       isSpaMode: isSpaMode2,
-      serializeError: (err) => serializeError(err, serverMode),
-      loadRouteModule: defaultLoadRouteModule
+      serializeError: (err) => serializeError(err, serverMode)
     };
     let handleDocumentRequestFunction = build.entry.module.default;
     try {
@@ -1465,7 +1422,35 @@ async function handleResourceRequest(serverMode, build, staticHandler, routeId,
     let response = await staticHandler.queryRoute(request, {
       routeId,
       requestContext: loadContext,
-      unstable_respond: build.future.unstable_middleware ? (ctx) => ctx : void 0
+      unstable_stream: build.future.unstable_middleware ? async (_, queryRoute) => {
+        try {
+          let result = await queryRoute(request);
+          if (isResponse(result)) {
+            return result;
+          }
+          if (typeof result === "string") {
+            return new Response(result);
+          }
+          return Response.json(result);
+        } catch (error) {
+          if (isResponse(error)) {
+            return error;
+          }
+          if (isRouteErrorResponse(error)) {
+            handleError(error);
+            return errorResponseToJson(error, serverMode);
+          }
+          if (error instanceof Error && error.message === "Expected a response from queryRoute") {
+            let newError = new Error(
+              "Expected a Response to be returned from resource route handler"
+            );
+            handleError(newError);
+            return returnLastResortErrorResponse(newError, serverMode);
+          }
+          handleError(error);
+          return returnLastResortErrorResponse(error, serverMode);
+        }
+      } : void 0
     });
     if (isResponse(response)) {
       return response;
@@ -2227,10 +2212,7 @@ function RSCHydratedRouter({
       }
     },
     routeDiscovery: { mode: "lazy", manifestPath: "/__manifest" },
-    routeModules: {},
-    loadRouteModule: () => {
-      throw new Error("Not required in RSC Mode");
-    }
+    routeModules: {}
   };
   return /* @__PURE__ */ React4.createElement(RSCRouterContext.Provider, { value: true }, /* @__PURE__ */ React4.createElement(RSCRouterGlobalErrorBoundary, { location: location2 }, /* @__PURE__ */ React4.createElement(FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React4.createElement(RouterProvider, { router, flushSync: ReactDOM.flushSync }))));
 }
@@ -2619,10 +2601,7 @@ function RSCStaticRouter({ getPayload }) {
       }
     },
     routeDiscovery: { mode: "lazy", manifestPath: "/__manifest" },
-    routeModules: {},
-    loadRouteModule: () => {
-      throw new Error("Not required in RSC Mode");
-    }
+    routeModules: {}
   };
   return /* @__PURE__ */ React5.createElement(RSCRouterContext.Provider, { value: true }, /* @__PURE__ */ React5.createElement(RSCRouterGlobalErrorBoundary, { location: payload.location }, /* @__PURE__ */ React5.createElement(FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React5.createElement(
     StaticRouterProvider,
@@ -2714,7 +2693,6 @@ function deserializeErrors(errors) {
 }
 
 export {
-  defaultLoadRouteModule,
   ServerRouter,
   createRoutesStub,
   createCookie,