react-router 7.13.1 → 7.13.2

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

@@ -27,7 +27,7 @@ function _interopNamespace(e) {
 var React2__namespace = /*#__PURE__*/_interopNamespace(React2);
 
 /**
- * react-router v7.13.1
+ * react-router v7.13.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -902,6 +902,10 @@ function createStaticHandler(routes, opts) {
   let basename = (opts ? opts.basename : null) || "/";
   let _mapRouteProperties = opts?.mapRouteProperties || defaultMapRouteProperties;
   let mapRouteProperties = _mapRouteProperties;
+  ({
+    // unused in static handler
+    ...opts?.future
+  });
   if (opts?.unstable_instrumentations) {
     let instrumentations = opts.unstable_instrumentations;
     mapRouteProperties = (route) => {
@@ -926,11 +930,12 @@ function createStaticHandler(routes, opts) {
     skipLoaderErrorBubbling,
     skipRevalidation,
     dataStrategy,
-    generateMiddlewareResponse
+    generateMiddlewareResponse,
+    unstable_normalizePath
   } = {}) {
-    let url = new URL(request.url);
+    let normalizePath = unstable_normalizePath || defaultNormalizePath;
     let method = request.method;
-    let location = createLocation("", createPath(url), null, "default");
+    let location = createLocation("", normalizePath(request), null, "default");
     let matches = matchRoutes(dataRoutes, location, basename);
     requestContext = requestContext != null ? requestContext : new RouterContextProvider();
     if (!isValidMethod(method) && method !== "HEAD") {
@@ -983,6 +988,7 @@ function createStaticHandler(routes, opts) {
         let response = await runServerMiddlewarePipeline(
           {
             request,
+            unstable_url: createDataFunctionUrl(request, location),
             unstable_pattern: getRoutePattern(matches),
             matches,
             params: matches[0].params,
@@ -1099,11 +1105,12 @@ function createStaticHandler(routes, opts) {
     routeId,
     requestContext,
     dataStrategy,
-    generateMiddlewareResponse
+    generateMiddlewareResponse,
+    unstable_normalizePath
   } = {}) {
-    let url = new URL(request.url);
+    let normalizePath = unstable_normalizePath || defaultNormalizePath;
     let method = request.method;
-    let location = createLocation("", createPath(url), null, "default");
+    let location = createLocation("", normalizePath(request), null, "default");
     let matches = matchRoutes(dataRoutes, location, basename);
     requestContext = requestContext != null ? requestContext : new RouterContextProvider();
     if (!isValidMethod(method) && method !== "HEAD" && method !== "OPTIONS") {
@@ -1129,6 +1136,7 @@ function createStaticHandler(routes, opts) {
       let response = await runServerMiddlewarePipeline(
         {
           request,
+          unstable_url: createDataFunctionUrl(request, location),
           unstable_pattern: getRoutePattern(matches),
           matches,
           params: matches[0].params,
@@ -1206,6 +1214,7 @@ function createStaticHandler(routes, opts) {
       if (isMutationMethod(request.method)) {
         let result2 = await submit(
           request,
+          location,
           matches,
           routeMatch || getTargetMatch(matches, location),
           requestContext,
@@ -1219,6 +1228,7 @@ function createStaticHandler(routes, opts) {
       }
       let result = await loadRouteData(
         request,
+        location,
         matches,
         requestContext,
         dataStrategy,
@@ -1244,7 +1254,7 @@ function createStaticHandler(routes, opts) {
       throw e;
     }
   }
-  async function submit(request, matches, actionMatch, requestContext, dataStrategy, skipLoaderErrorBubbling, isRouteRequest, filterMatchesToLoad, skipRevalidation) {
+  async function submit(request, location, matches, actionMatch, requestContext, dataStrategy, skipLoaderErrorBubbling, isRouteRequest, filterMatchesToLoad, skipRevalidation) {
     let result;
     if (!actionMatch.route.action && !actionMatch.route.lazy) {
       let error = getInternalRouterError(405, {
@@ -1264,6 +1274,7 @@ function createStaticHandler(routes, opts) {
         mapRouteProperties,
         manifest,
         request,
+        location,
         matches,
         actionMatch,
         [],
@@ -1271,6 +1282,7 @@ function createStaticHandler(routes, opts) {
       );
       let results = await callDataStrategy(
         request,
+        location,
         dsMatches,
         isRouteRequest,
         requestContext,
@@ -1344,6 +1356,7 @@ function createStaticHandler(routes, opts) {
       let boundaryMatch = skipLoaderErrorBubbling ? actionMatch : findNearestBoundary(matches, actionMatch.route.id);
       let handlerContext2 = await loadRouteData(
         loaderRequest,
+        location,
         matches,
         requestContext,
         dataStrategy,
@@ -1363,6 +1376,7 @@ function createStaticHandler(routes, opts) {
     }
     let handlerContext = await loadRouteData(
       loaderRequest,
+      location,
       matches,
       requestContext,
       dataStrategy,
@@ -1380,7 +1394,7 @@ function createStaticHandler(routes, opts) {
       actionHeaders: result.headers ? { [actionMatch.route.id]: result.headers } : {}
     };
   }
-  async function loadRouteData(request, matches, requestContext, dataStrategy, skipLoaderErrorBubbling, routeMatch, filterMatchesToLoad, pendingActionResult) {
+  async function loadRouteData(request, location, matches, requestContext, dataStrategy, skipLoaderErrorBubbling, routeMatch, filterMatchesToLoad, pendingActionResult) {
     let isRouteRequest = routeMatch != null;
     if (isRouteRequest && !routeMatch?.route.loader && !routeMatch?.route.lazy) {
       throw getInternalRouterError(400, {
@@ -1395,6 +1409,7 @@ function createStaticHandler(routes, opts) {
         mapRouteProperties,
         manifest,
         request,
+        location,
         matches,
         routeMatch,
         [],
@@ -1412,6 +1427,7 @@ function createStaticHandler(routes, opts) {
             mapRouteProperties,
             manifest,
             request,
+            location,
             pattern,
             match,
             [],
@@ -1423,6 +1439,7 @@ function createStaticHandler(routes, opts) {
           mapRouteProperties,
           manifest,
           request,
+          location,
           pattern,
           match,
           [],
@@ -1444,6 +1461,7 @@ function createStaticHandler(routes, opts) {
     }
     let results = await callDataStrategy(
       request,
+      location,
       dsMatches,
       isRouteRequest,
       requestContext,
@@ -1464,10 +1482,11 @@ function createStaticHandler(routes, opts) {
       matches
     };
   }
-  async function callDataStrategy(request, matches, isRouteRequest, requestContext, dataStrategy) {
+  async function callDataStrategy(request, location, matches, isRouteRequest, requestContext, dataStrategy) {
     let results = await callDataStrategyImpl(
       dataStrategy || defaultDataStrategy,
       request,
+      location,
       matches,
       null,
       requestContext);
@@ -1525,6 +1544,14 @@ function throwStaticHandlerAbortedError(request, isRouteRequest) {
     `${method}() call aborted without an \`AbortSignal.reason\`: ${request.method} ${request.url}`
   );
 }
+function defaultNormalizePath(request) {
+  let url = new URL(request.url);
+  return {
+    pathname: url.pathname,
+    search: url.search,
+    hash: url.hash
+  };
+}
 function normalizeTo(location, matches, basename, to, fromRouteId, relative) {
   let contextualMatches;
   let activeRouteMatch;
@@ -1762,17 +1789,12 @@ function runServerMiddlewarePipeline(args, handler, errorHandler) {
   }
 }
 async function runMiddlewarePipeline(args, handler, processResult, isResult, errorHandler) {
-  let { matches, request, params, context, unstable_pattern } = args;
+  let { matches, ...dataFnArgs } = args;
   let tuples = matches.flatMap(
     (m) => m.route.middleware ? m.route.middleware.map((fn) => [m.route.id, fn]) : []
   );
   let result = await callRouteMiddleware(
-    {
-      request,
-      params,
-      context,
-      unstable_pattern
-    },
+    dataFnArgs,
     tuples,
     handler,
     processResult,
@@ -1850,7 +1872,7 @@ function getDataStrategyMatchLazyPromises(mapRouteProperties, manifest, request,
     handler: lazyRoutePromises.lazyHandlerPromise
   };
 }
-function getDataStrategyMatch(mapRouteProperties, manifest, request, unstable_pattern, match, lazyRoutePropertiesToSkip, scopedContext, shouldLoad, shouldRevalidateArgs = null, callSiteDefaultShouldRevalidate) {
+function getDataStrategyMatch(mapRouteProperties, manifest, request, path, unstable_pattern, match, lazyRoutePropertiesToSkip, scopedContext, shouldLoad, shouldRevalidateArgs = null, callSiteDefaultShouldRevalidate) {
   let isUsingNewApi = false;
   let _lazyPromises = getDataStrategyMatchLazyPromises(
     mapRouteProperties,
@@ -1884,6 +1906,7 @@ function getDataStrategyMatch(mapRouteProperties, manifest, request, unstable_pa
       if (callHandler && (isMutationMethod(request.method) || !isMiddlewareOnlyRoute)) {
         return callLoaderOrAction({
           request,
+          path,
           unstable_pattern,
           match,
           lazyHandlerPromise: _lazyPromises?.handler,
@@ -1896,7 +1919,7 @@ function getDataStrategyMatch(mapRouteProperties, manifest, request, unstable_pa
     }
   };
 }
-function getTargetedDataStrategyMatches(mapRouteProperties, manifest, request, matches, targetMatch, lazyRoutePropertiesToSkip, scopedContext, shouldRevalidateArgs = null) {
+function getTargetedDataStrategyMatches(mapRouteProperties, manifest, request, path, matches, targetMatch, lazyRoutePropertiesToSkip, scopedContext, shouldRevalidateArgs = null) {
   return matches.map((match) => {
     if (match.route.id !== targetMatch.route.id) {
       return {
@@ -1918,6 +1941,7 @@ function getTargetedDataStrategyMatches(mapRouteProperties, manifest, request, m
       mapRouteProperties,
       manifest,
       request,
+      path,
       getRoutePattern(matches),
       match,
       lazyRoutePropertiesToSkip,
@@ -1927,12 +1951,13 @@ function getTargetedDataStrategyMatches(mapRouteProperties, manifest, request, m
     );
   });
 }
-async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherKey, scopedContext, isStaticHandler) {
+async function callDataStrategyImpl(dataStrategyImpl, request, path, matches, fetcherKey, scopedContext, isStaticHandler) {
   if (matches.some((m) => m._lazyPromises?.middleware)) {
     await Promise.all(matches.map((m) => m._lazyPromises?.middleware));
   }
   let dataStrategyArgs = {
     request,
+    unstable_url: createDataFunctionUrl(request, path),
     unstable_pattern: getRoutePattern(matches),
     params: matches[0].params,
     context: scopedContext,
@@ -1961,6 +1986,7 @@ async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherK
 }
 async function callLoaderOrAction({
   request,
+  path,
   unstable_pattern,
   match,
   lazyHandlerPromise,
@@ -1988,6 +2014,7 @@ async function callLoaderOrAction({
       return handler(
         {
           request,
+          unstable_url: createDataFunctionUrl(request, path),
           unstable_pattern,
           params: match.params,
           context: scopedContext
@@ -2145,6 +2172,24 @@ function normalizeRelativeRoutingRedirectResponse(response, request, routeId, ma
   }
   return response;
 }
+function createDataFunctionUrl(request, path) {
+  let url = new URL(request.url);
+  let parsed = typeof path === "string" ? parsePath(path) : path;
+  url.pathname = parsed.pathname || "/";
+  if (parsed.search) {
+    let searchParams = new URLSearchParams(parsed.search);
+    let indexValues = searchParams.getAll("index");
+    searchParams.delete("index");
+    for (let value of indexValues.filter(Boolean)) {
+      searchParams.append("index", value);
+    }
+    url.search = searchParams.size ? `?${searchParams.toString()}` : "";
+  } else {
+    url.search = "";
+  }
+  url.hash = parsed.hash || "";
+  return url;
+}
 function processRouteLoaderData(matches, results, pendingActionResult, isStaticHandler = false, skipLoaderErrorBubbling = false) {
   let loaderData = {};
   let errors = null;
@@ -2512,6 +2557,35 @@ function createRouteErrorResponseDigest(response) {
   )}`;
 }
 
+// lib/server-runtime/urls.ts
+function getNormalizedPath(request, basename, future) {
+  basename = basename || "/";
+  let url = new URL(request.url);
+  let pathname = url.pathname;
+  {
+    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/rsc/server.rsc.ts
 var Outlet = reactServerClient.Outlet;
 var WithComponentProps = reactServerClient.UNSAFE_WithComponentProps;
@@ -2800,7 +2874,8 @@ async function generateResourceResponse(request, routes, basename, routeId, requ
         } catch (error) {
           return generateErrorResponse(error);
         }
-      }
+      },
+      unstable_normalizePath: (r) => getNormalizedPath(r, basename, null)
     });
     return response;
   } catch (error) {
@@ -2856,6 +2931,7 @@ async function generateRenderResponse(request, routes, basename, isDataRequest,
       skipLoaderErrorBubbling: isDataRequest,
       skipRevalidation: isSubmission,
       ...routeIdsToLoad ? { filterMatchesToLoad: (m) => routeIdsToLoad.includes(m.route.id) } : {},
+      unstable_normalizePath: (r) => getNormalizedPath(r, basename),
       async generateMiddlewareResponse(query) {
         let formState;
         let skipRevalidation = false;
@@ -3103,16 +3179,17 @@ async function getRSCRouteMatch({
   routeIdsToLoad,
   parentId
 }) {
-  await explodeLazyRoute(match.route);
-  const Layout = match.route.Layout || React2__namespace.Fragment;
-  const Component = match.route.Component;
-  const ErrorBoundary = match.route.ErrorBoundary;
-  const HydrateFallback = match.route.HydrateFallback;
-  const loaderData = staticContext.loaderData[match.route.id];
-  const actionData = staticContext.actionData?.[match.route.id];
+  const route = match.route;
+  await explodeLazyRoute(route);
+  const Layout = route.Layout || React2__namespace.Fragment;
+  const Component = route.Component;
+  const ErrorBoundary = route.ErrorBoundary;
+  const HydrateFallback = route.HydrateFallback;
+  const loaderData = staticContext.loaderData[route.id];
+  const actionData = staticContext.actionData?.[route.id];
   const params = match.params;
   let element = void 0;
-  let shouldLoadRoute = !routeIdsToLoad || routeIdsToLoad.includes(match.route.id);
+  let shouldLoadRoute = !routeIdsToLoad || routeIdsToLoad.includes(route.id);
   if (Component && shouldLoadRoute) {
     element = !isBelowErrorBoundary ? React2__namespace.createElement(
       Layout,
@@ -3131,7 +3208,7 @@ async function getRSCRouteMatch({
   }
   let error = void 0;
   if (ErrorBoundary && staticContext.errors) {
-    error = staticContext.errors[match.route.id];
+    error = staticContext.errors[route.id];
   }
   const errorElement = ErrorBoundary ? React2__namespace.createElement(
     Layout,
@@ -3156,31 +3233,32 @@ async function getRSCRouteMatch({
       params
     })
   ) : void 0;
+  const hmrRoute = route;
   return {
-    clientAction: match.route.clientAction,
-    clientLoader: match.route.clientLoader,
+    clientAction: route.clientAction,
+    clientLoader: route.clientLoader,
     element,
     errorElement,
-    handle: match.route.handle,
-    hasAction: !!match.route.action,
+    handle: route.handle,
+    hasAction: !!route.action,
     hasComponent: !!Component,
     hasErrorBoundary: !!ErrorBoundary,
-    hasLoader: !!match.route.loader,
+    hasLoader: !!route.loader,
     hydrateFallbackElement,
-    id: match.route.id,
-    index: match.route.index,
-    links: match.route.links,
-    meta: match.route.meta,
+    id: route.id,
+    index: "index" in route ? route.index : void 0,
+    links: route.links,
+    meta: route.meta,
     params,
     parentId,
-    path: match.route.path,
+    path: route.path,
     pathname: match.pathname,
     pathnameBase: match.pathnameBase,
-    shouldRevalidate: match.route.shouldRevalidate,
+    shouldRevalidate: route.shouldRevalidate,
     // Add an unused client-only export (if present) so HMR can support
     // switching between server-first and client-only routes during development
-    ...match.route.__ensureClientRouteModuleForHMR ? {
-      __ensureClientRouteModuleForHMR: match.route.__ensureClientRouteModuleForHMR
+    ...hmrRoute.__ensureClientRouteModuleForHMR ? {
+      __ensureClientRouteModuleForHMR: hmrRoute.__ensureClientRouteModuleForHMR
     } : {}
   };
 }