react-router 7.13.1 → 7.13.2

package/dist/{development/chunk-JPUPSTYD.mjs → production/chunk-PY35PE22.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.13.1
+ * react-router v7.13.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -51,7 +51,7 @@ import {
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-LFPYN7LY.mjs";
+} from "./chunk-2BDJPJTA.mjs";
 
 // lib/dom/ssr/server.tsx
 import * as React from "react";
@@ -137,6 +137,7 @@ function createRoutesStub(routes, _context) {
     if (routerRef.current == null) {
       frameworkContextRef.current = {
         future: {
+          unstable_passThroughRequests: future?.unstable_passThroughRequests === true,
           unstable_subResourceIntegrity: future?.unstable_subResourceIntegrity === true,
           v8_middleware: future?.v8_middleware === true,
           unstable_trailingSlashAwareDataRequests: future?.unstable_trailingSlashAwareDataRequests === true
@@ -154,7 +155,7 @@ function createRoutesStub(routes, _context) {
       };
       let patched = processRoutes(
         // @ts-expect-error `StubRouteObject` is stricter about `loader`/`action`
-        // types compared to `AgnosticRouteObject`
+        // types compared to `RouteObject`
         convertRoutesToDataRoutes(routes, (r) => r),
         _context !== void 0 ? _context : future?.v8_middleware ? new RouterContextProvider() : {},
         frameworkContextRef.current.manifest,
@@ -505,9 +506,10 @@ function matchServerRoutes(routes, pathname, basename) {
 }
 
 // lib/server-runtime/data.ts
-async function callRouteHandler(handler, args) {
+async function callRouteHandler(handler, args, future) {
   let result = await handler({
-    request: stripRoutesParam(stripIndexParam(args.request)),
+    request: future.unstable_passThroughRequests ? args.request : stripRoutesParam(stripIndexParam(args.request)),
+    unstable_url: args.unstable_url,
     params: args.params,
     context: args.context,
     unstable_pattern: args.unstable_pattern
@@ -656,10 +658,14 @@ function createStaticHandlerDataRoutes(manifest, future, parentId = "", routesBy
             return result.data;
           }
         }
-        let val = await callRouteHandler(route.module.loader, args);
+        let val = await callRouteHandler(
+          route.module.loader,
+          args,
+          future
+        );
         return val;
       } : void 0,
-      action: route.module.action ? (args) => callRouteHandler(route.module.action, args) : void 0,
+      action: route.module.action ? (args) => callRouteHandler(route.module.action, args, future) : void 0,
       handle: route.module.handle
     };
     return route.index ? {
@@ -838,6 +844,41 @@ function parseHostHeader(headers) {
   } : void 0;
 }
 
+// lib/server-runtime/urls.ts
+function getNormalizedPath(request, basename, future) {
+  basename = basename || "/";
+  let url = new URL(request.url);
+  let pathname = url.pathname;
+  if (future?.unstable_trailingSlashAwareDataRequests) {
+    if (pathname.endsWith("/_.data")) {
+      pathname = pathname.replace(/_\.data$/, "");
+    } else {
+      pathname = pathname.replace(/\.data$/, "");
+    }
+  } else {
+    if (stripBasename(pathname, basename) === "/_root.data") {
+      pathname = basename;
+    } else if (pathname.endsWith(".data")) {
+      pathname = pathname.replace(/\.data$/, "");
+    }
+    if (stripBasename(pathname, basename) !== "/" && pathname.endsWith("/")) {
+      pathname = pathname.slice(0, -1);
+    }
+  }
+  let searchParams = new URLSearchParams(url.search);
+  searchParams.delete("_routes");
+  let search = searchParams.toString();
+  if (search) {
+    search = `?${search}`;
+  }
+  return {
+    pathname,
+    search,
+    // No hashes on the server
+    hash: ""
+  };
+}
+
 // lib/server-runtime/single-fetch.ts
 var SERVER_NO_BODY_STATUS_CODES = /* @__PURE__ */ new Set([
   ...NO_BODY_STATUS_CODES,
@@ -853,7 +894,7 @@ async function singleFetchAction(build, serverMode, staticHandler, request, hand
     } catch (e) {
       return handleQueryError(new Error("Bad Request"), 400);
     }
-    let handlerRequest = new Request(handlerUrl, {
+    let handlerRequest = build.future.unstable_passThroughRequests ? request : new Request(handlerUrl, {
       method: request.method,
       body: request.body,
       headers: request.headers,
@@ -871,7 +912,8 @@ async function singleFetchAction(build, serverMode, staticHandler, request, hand
         } catch (error) {
           return handleQueryError(error);
         }
-      } : void 0
+      } : void 0,
+      unstable_normalizePath: (r) => getNormalizedPath(r, build.basename, build.future)
     });
     return handleQueryResult(result);
   } catch (error) {
@@ -920,7 +962,7 @@ async function singleFetchLoaders(build, serverMode, staticHandler, request, han
   let routesParam = new URL(request.url).searchParams.get("_routes");
   let loadRouteIds = routesParam ? new Set(routesParam.split(",")) : null;
   try {
-    let handlerRequest = new Request(handlerUrl, {
+    let handlerRequest = build.future.unstable_passThroughRequests ? request : new Request(handlerUrl, {
       headers: request.headers,
       signal: request.signal
     });
@@ -935,7 +977,8 @@ async function singleFetchLoaders(build, serverMode, staticHandler, request, han
         } catch (error) {
           return handleQueryError(error);
         }
-      } : void 0
+      } : void 0,
+      unstable_normalizePath: (r) => getNormalizedPath(r, build.basename, build.future)
     });
     return handleQueryResult(result);
   } catch (error) {
@@ -1132,36 +1175,23 @@ function derive(build, mode) {
     } else {
       loadContext = initialContext || {};
     }
-    let url = new URL(request.url);
-    let normalizedBasename = build.basename || "/";
-    let normalizedPath = url.pathname;
-    if (build.future.unstable_trailingSlashAwareDataRequests) {
-      if (normalizedPath.endsWith("/_.data")) {
-        normalizedPath = normalizedPath.replace(/_.data$/, "");
-      } else {
-        normalizedPath = normalizedPath.replace(/\.data$/, "");
-      }
-    } else {
-      if (stripBasename(normalizedPath, normalizedBasename) === "/_root.data") {
-        normalizedPath = normalizedBasename;
-      } else if (normalizedPath.endsWith(".data")) {
-        normalizedPath = normalizedPath.replace(/\.data$/, "");
-      }
-      if (stripBasename(normalizedPath, normalizedBasename) !== "/" && normalizedPath.endsWith("/")) {
-        normalizedPath = normalizedPath.slice(0, -1);
-      }
-    }
+    let requestUrl = new URL(request.url);
+    let normalizedPathname = getNormalizedPath(
+      request,
+      build.basename,
+      build.future
+    ).pathname;
     let isSpaMode = getBuildTimeHeader(request, "X-React-Router-SPA-Mode") === "yes";
     if (!build.ssr) {
-      let decodedPath = decodeURI(normalizedPath);
-      if (normalizedBasename !== "/") {
-        let strippedPath = stripBasename(decodedPath, normalizedBasename);
+      let decodedPath = decodeURI(normalizedPathname);
+      if (build.basename && build.basename !== "/") {
+        let strippedPath = stripBasename(decodedPath, build.basename);
         if (strippedPath == null) {
           errorHandler(
             new ErrorResponseImpl(
               404,
               "Not Found",
-              `Refusing to prerender the \`${decodedPath}\` path because it does not start with the basename \`${normalizedBasename}\``
+              `Refusing to prerender the \`${decodedPath}\` path because it does not start with the basename \`${build.basename}\``
             ),
             {
               context: loadContext,
@@ -1179,7 +1209,7 @@ function derive(build, mode) {
       if (build.prerender.length === 0) {
         isSpaMode = true;
       } else if (!build.prerender.includes(decodedPath) && !build.prerender.includes(decodedPath + "/")) {
-        if (url.pathname.endsWith(".data")) {
+        if (requestUrl.pathname.endsWith(".data")) {
           errorHandler(
             new ErrorResponseImpl(
               404,
@@ -1203,28 +1233,26 @@ function derive(build, mode) {
     }
     let manifestUrl = getManifestPath(
       build.routeDiscovery.manifestPath,
-      normalizedBasename
+      build.basename
     );
-    if (url.pathname === manifestUrl) {
+    if (requestUrl.pathname === manifestUrl) {
       try {
-        let res = await handleManifestRequest(build, routes, url);
+        let res = await handleManifestRequest(build, routes, requestUrl);
         return res;
       } catch (e) {
         handleError(e);
         return new Response("Unknown Server Error", { status: 500 });
       }
     }
-    let matches = matchServerRoutes(routes, normalizedPath, build.basename);
+    let matches = matchServerRoutes(routes, normalizedPathname, build.basename);
     if (matches && matches.length > 0) {
       Object.assign(params, matches[0].params);
     }
     let response;
-    if (url.pathname.endsWith(".data")) {
-      let handlerUrl = new URL(request.url);
-      handlerUrl.pathname = normalizedPath;
+    if (requestUrl.pathname.endsWith(".data")) {
       let singleFetchMatches = matchServerRoutes(
         routes,
-        handlerUrl.pathname,
+        normalizedPathname,
         build.basename
       );
       response = await handleSingleFetchRequest(
@@ -1232,7 +1260,7 @@ function derive(build, mode) {
         build,
         staticHandler,
         request,
-        handlerUrl,
+        normalizedPathname,
         loadContext,
         handleError
       );
@@ -1270,7 +1298,7 @@ function derive(build, mode) {
         handleError
       );
     } else {
-      let { pathname } = url;
+      let { pathname } = requestUrl;
       let criticalCss = void 0;
       if (build.unstable_getCriticalCss) {
         criticalCss = await build.unstable_getCriticalCss({ pathname });
@@ -1383,7 +1411,9 @@ async function handleManifestRequest(build, routes, url) {
   }
   return new Response("Invalid Request", { status: 400 });
 }
-async function handleSingleFetchRequest(serverMode, build, staticHandler, request, handlerUrl, loadContext, handleError) {
+async function handleSingleFetchRequest(serverMode, build, staticHandler, request, normalizedPath, loadContext, handleError) {
+  let handlerUrl = new URL(request.url);
+  handlerUrl.pathname = normalizedPath;
   let response = request.method !== "GET" ? await singleFetchAction(
     build,
     serverMode,
@@ -1429,7 +1459,8 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
           handleError(error);
           return new Response(null, { status: 500 });
         }
-      } : void 0
+      } : void 0,
+      unstable_normalizePath: (r) => getNormalizedPath(r, build.basename, build.future)
     });
     if (!isResponse(result)) {
       result = await renderHtml(result, isSpaMode);
@@ -1561,7 +1592,8 @@ async function handleResourceRequest(serverMode, build, staticHandler, routeId,
         } catch (error) {
           return handleQueryRouteError(error);
         }
-      } : void 0
+      } : void 0,
+      unstable_normalizePath: (r) => getNormalizedPath(r, build.basename, build.future)
     });
     return handleQueryRouteResult(result);
   } catch (error) {
@@ -2388,7 +2420,9 @@ function RSCStaticRouter({ getPayload }) {
       // flags that drive runtime behavior they'll need to be proxied through.
       v8_middleware: false,
       unstable_subResourceIntegrity: false,
-      unstable_trailingSlashAwareDataRequests: true
+      unstable_trailingSlashAwareDataRequests: true,
+      // always on for RSC
+      unstable_passThroughRequests: true
       // always on for RSC
     },
     isSpaMode: false,