react-router 7.8.0 → 7.8.1-pre.1

package/dist/production/{chunk-SIHON65V.mjs → chunk-HVGIEXH6.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.8.0
+ * react-router v7.8.1-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -513,8 +513,8 @@ function convertRouteMatchToUiMatch(match, loaderData) {
     handle: route.handle
   };
 }
-function flattenRoutes(routes, branches = [], parentsMeta = [], parentPath = "") {
-  let flattenRoute = (route, index, relativePath) => {
+function flattenRoutes(routes, branches = [], parentsMeta = [], parentPath = "", _hasParentOptionalSegments = false) {
+  let flattenRoute = (route, index, hasParentOptionalSegments = _hasParentOptionalSegments, relativePath) => {
     let meta = {
       relativePath: relativePath === void 0 ? route.path || "" : relativePath,
       caseSensitive: route.caseSensitive === true,
@@ -522,6 +522,9 @@ function flattenRoutes(routes, branches = [], parentsMeta = [], parentPath = "")
       route
     };
     if (meta.relativePath.startsWith("/")) {
+      if (!meta.relativePath.startsWith(parentPath) && hasParentOptionalSegments) {
+        return;
+      }
       invariant(
         meta.relativePath.startsWith(parentPath),
         `Absolute route path "${meta.relativePath}" nested under path "${parentPath}" is not valid. An absolute child route path must start with the combined path of all its parent routes.`
@@ -537,7 +540,13 @@ function flattenRoutes(routes, branches = [], parentsMeta = [], parentPath = "")
         route.index !== true,
         `Index routes must not have child routes. Please remove all child routes from route path "${path}".`
       );
-      flattenRoutes(route.children, branches, routesMeta, path);
+      flattenRoutes(
+        route.children,
+        branches,
+        routesMeta,
+        path,
+        hasParentOptionalSegments
+      );
     }
     if (route.path == null && !route.index) {
       return;
@@ -553,7 +562,7 @@ function flattenRoutes(routes, branches = [], parentsMeta = [], parentPath = "")
       flattenRoute(route, index);
     } else {
       for (let exploded of explodeOptionalSegments(route.path)) {
-        flattenRoute(route, index, exploded);
+        flattenRoute(route, index, true, exploded);
       }
     }
   });
@@ -745,7 +754,7 @@ function compilePath(path, caseSensitive = false, end = true) {
       params.push({ paramName, isOptional: isOptional != null });
       return isOptional ? "/?([^\\/]+)?" : "/([^\\/]+)";
     }
-  );
+  ).replace(/\/([\w-]+)\?(\/|$)/g, "(/$1)?$2");
   if (path.endsWith("*")) {
     params.push({ paramName: "*" });
     regexpSource += path === "*" || path === "/*" ? "(.*)$" : "(?:\\/(.+)|\\/*)$";
@@ -2814,9 +2823,23 @@ function createStaticHandler(routes, opts) {
             return res;
           },
           async (error, routeId) => {
-            if (isResponse(error)) {
+            if (isRedirectResponse(error)) {
               return error;
             }
+            if (isResponse(error)) {
+              try {
+                error = new ErrorResponseImpl(
+                  error.status,
+                  error.statusText,
+                  await parseResponseBody(error)
+                );
+              } catch (e) {
+                error = e;
+              }
+            }
+            if (isDataWithResponseInit(error)) {
+              error = dataWithResponseInitToErrorResponse(error);
+            }
             if (renderedStaticContext) {
               if (routeId in renderedStaticContext.loaderData) {
                 renderedStaticContext.loaderData[routeId] = void 0;
@@ -2942,8 +2965,8 @@ function createStaticHandler(routes, opts) {
           return res;
         },
         (error) => {
-          if (isRouteErrorResponse(error)) {
-            return Promise.resolve(errorResponseToResponse(error));
+          if (isDataWithResponseInit(error)) {
+            return Promise.resolve(dataWithResponseInitToResponse(error));
           }
           if (isResponse(error)) {
             return Promise.resolve(error);
@@ -3272,8 +3295,12 @@ function createStaticHandler(routes, opts) {
             basename
           );
         }
-        if (isResponse(result.result) && isRouteRequest) {
-          throw result;
+        if (isRouteRequest) {
+          if (isResponse(result.result)) {
+            throw result;
+          } else if (isDataWithResponseInit(result.result)) {
+            throw dataWithResponseInitToResponse(result.result);
+          }
         }
         dataResults[match.route.id] = await convertDataStrategyResultToDataResult(result);
       })
@@ -3941,9 +3968,15 @@ function clientMiddlewareErrorHandler(error, routeId, matches, didCallHandler) {
       [routeId]: { type: "error", result: error }
     };
   } else {
+    let maxBoundaryIdx = Math.min(
+      // Throwing route
+      matches.findIndex((m) => m.route.id === routeId) || 0,
+      // or the shallowest route that needs to load data
+      matches.findIndex((m) => m.unstable_shouldCallHandler()) || 0
+    );
     let boundaryRouteId = findNearestBoundary(
       matches,
-      matches.find((m) => m.route.id === routeId || m.route.loader)?.route.id || routeId
+      matches[maxBoundaryIdx].route.id
     ).route.id;
     return {
       [boundaryRouteId]: { type: "error", result: error }
@@ -4003,11 +4036,7 @@ async function callServerRouteMiddleware(args, middlewares, handler, errorHandle
       nextResult = result;
       return nextResult;
     } catch (e) {
-      nextResult = await errorHandler(
-        // Convert thrown data() values to ErrorResponses
-        isDataWithResponseInit(e) ? dataWithResponseInitToErrorResponse(e) : e,
-        routeId
-      );
+      nextResult = await errorHandler(e, routeId);
       return nextResult;
     }
   };
@@ -4032,11 +4061,7 @@ async function callServerRouteMiddleware(args, middlewares, handler, errorHandle
       return nextResult;
     }
   } catch (e) {
-    let response = await errorHandler(
-      // Convert thrown data() values to ErrorResponses
-      isDataWithResponseInit(e) ? dataWithResponseInitToErrorResponse(e) : e,
-      routeId
-    );
+    let response = await errorHandler(e, routeId);
     return response;
   }
 }
@@ -4362,21 +4387,19 @@ async function callLoaderOrAction({
   }
   return result;
 }
+async function parseResponseBody(response) {
+  let contentType = response.headers.get("Content-Type");
+  if (contentType && /\bapplication\/json\b/.test(contentType)) {
+    return response.body == null ? null : response.json();
+  }
+  return response.text();
+}
 async function convertDataStrategyResultToDataResult(dataStrategyResult) {
   let { result, type } = dataStrategyResult;
   if (isResponse(result)) {
     let data2;
     try {
-      let contentType = result.headers.get("Content-Type");
-      if (contentType && /\bapplication\/json\b/.test(contentType)) {
-        if (result.body == null) {
-          data2 = null;
-        } else {
-          data2 = await result.json();
-        }
-      } else {
-        data2 = await result.text();
-      }
+      data2 = await parseResponseBody(result);
     } catch (e) {
       return { type: "error" /* error */, error: e };
     }
@@ -4706,10 +4729,7 @@ function isHashChangeOnly(a, b) {
   return false;
 }
 function dataWithResponseInitToResponse(data2) {
-  return new Response(
-    typeof data2.data === "string" ? data2.data : JSON.stringify(data2.data),
-    data2.init || void 0
-  );
+  return Response.json(data2.data, data2.init ?? void 0);
 }
 function dataWithResponseInitToErrorResponse(data2) {
   return new ErrorResponseImpl(
@@ -4718,15 +4738,6 @@ function dataWithResponseInitToErrorResponse(data2) {
     data2.data
   );
 }
-function errorResponseToResponse(error) {
-  return new Response(
-    typeof error.data === "string" ? error.data : JSON.stringify(error.data),
-    {
-      status: error.status,
-      statusText: error.statusText
-    }
-  );
-}
 function isDataStrategyResult(result) {
   return result != null && typeof result === "object" && "type" in result && "result" in result && (result.type === "data" /* data */ || result.type === "error" /* error */);
 }
@@ -8698,6 +8709,9 @@ function isValidMetaTag(tagName) {
   return typeof tagName === "string" && /^(meta|link)$/.test(tagName);
 }
 var isHydrated = false;
+function setIsHydrated() {
+  isHydrated = true;
+}
 function Scripts(scriptProps) {
   let {
     manifest,
@@ -8716,7 +8730,7 @@ function Scripts(scriptProps) {
   }
   let matches = getActiveMatches(routerMatches, null, isSpaMode);
   React8.useEffect(() => {
-    isHydrated = true;
+    setIsHydrated();
   }, []);
   let initialScripts = React8.useMemo(() => {
     if (isRSCRouterContext) {
@@ -8972,7 +8986,7 @@ var isBrowser = typeof window !== "undefined" && typeof window.document !== "und
 try {
   if (isBrowser) {
     window.__reactRouterVersion = // @ts-expect-error
-    "7.8.0";
+    "7.8.1-pre.1";
   }
 } catch (e) {
 }
@@ -10171,6 +10185,7 @@ export {
   Links,
   PrefetchPageLinks,
   Meta,
+  setIsHydrated,
   Scripts,
   createBrowserRouter,
   createHashRouter,

package/dist/{development/chunk-HZX6U7MI.mjs → production/chunk-J44BHEXU.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.8.0
+ * react-router v7.8.1-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -46,6 +46,7 @@ import {
   redirect,
   redirectDocument,
   replace,
+  setIsHydrated,
   shouldHydrateRouteLoader,
   singleFetchUrl,
   stripBasename,
@@ -57,7 +58,7 @@ import {
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-ZYFC6VSF.mjs";
+} from "./chunk-HVGIEXH6.mjs";
 
 // lib/dom/ssr/server.tsx
 import * as React from "react";
@@ -1122,6 +1123,28 @@ var createRequestHandler = (build, mode) => {
     let isSpaMode = getBuildTimeHeader(request, "X-React-Router-SPA-Mode") === "yes";
     if (!_build.ssr) {
       let decodedPath = decodeURI(normalizedPath);
+      if (normalizedBasename !== "/") {
+        let strippedPath = stripBasename(decodedPath, normalizedBasename);
+        if (strippedPath == null) {
+          errorHandler(
+            new ErrorResponseImpl(
+              404,
+              "Not Found",
+              `Refusing to prerender the \`${decodedPath}\` path because it does not start with the basename \`${normalizedBasename}\``
+            ),
+            {
+              context: loadContext,
+              params,
+              request
+            }
+          );
+          return new Response("Not Found", {
+            status: 404,
+            statusText: "Not Found"
+          });
+        }
+        decodedPath = strippedPath;
+      }
       if (_build.prerender.length === 0) {
         isSpaMode = true;
       } else if (!_build.prerender.includes(decodedPath) && !_build.prerender.includes(decodedPath + "/")) {
@@ -1834,6 +1857,26 @@ function RSCDefaultRootErrorBoundary({
   );
 }
 
+// lib/rsc/route-modules.ts
+function createRSCRouteModules(payload) {
+  const routeModules = {};
+  for (const match of payload.matches) {
+    populateRSCRouteModules(routeModules, match);
+  }
+  return routeModules;
+}
+function populateRSCRouteModules(routeModules, matches) {
+  matches = Array.isArray(matches) ? matches : [matches];
+  for (const match of matches) {
+    routeModules[match.id] = {
+      links: match.links,
+      meta: match.meta,
+      default: noopComponent
+    };
+  }
+}
+var noopComponent = () => null;
+
 // lib/rsc/browser.tsx
 function createCallServer({
   createFromReadableStream,
@@ -1867,7 +1910,7 @@ function createCallServer({
         window.location.href = payload.location;
         return;
       }
-      globalVar.__router.navigate(payload.location, {
+      globalVar.__reactRouterDataRouter.navigate(payload.location, {
         replace: payload.replace
       });
       return payload.actionResult;
@@ -1888,34 +1931,38 @@ function createCallServer({
                 window.location.href = rerender.location;
                 return;
               }
-              globalVar.__router.navigate(rerender.location, {
+              globalVar.__reactRouterDataRouter.navigate(rerender.location, {
                 replace: rerender.replace
               });
               return;
             }
             let lastMatch;
             for (const match of rerender.matches) {
-              globalVar.__router.patchRoutes(
+              globalVar.__reactRouterDataRouter.patchRoutes(
                 lastMatch?.id ?? null,
                 [createRouteFromServerManifest(match)],
                 true
               );
               lastMatch = match;
             }
-            window.__router._internalSetStateDoNotUseOrYouWillBreakYourApp({});
+            window.__reactRouterDataRouter._internalSetStateDoNotUseOrYouWillBreakYourApp(
+              {}
+            );
             React4.startTransition(() => {
-              window.__router._internalSetStateDoNotUseOrYouWillBreakYourApp({
-                loaderData: Object.assign(
-                  {},
-                  globalVar.__router.state.loaderData,
-                  rerender.loaderData
-                ),
-                errors: rerender.errors ? Object.assign(
-                  {},
-                  globalVar.__router.state.errors,
-                  rerender.errors
-                ) : null
-              });
+              window.__reactRouterDataRouter._internalSetStateDoNotUseOrYouWillBreakYourApp(
+                {
+                  loaderData: Object.assign(
+                    {},
+                    globalVar.__reactRouterDataRouter.state.loaderData,
+                    rerender.loaderData
+                  ),
+                  errors: rerender.errors ? Object.assign(
+                    {},
+                    globalVar.__reactRouterDataRouter.state.errors,
+                    rerender.errors
+                  ) : null
+                }
+              );
             });
           }
         }
@@ -1931,8 +1978,14 @@ function createRouterFromPayload({
   payload
 }) {
   const globalVar = window;
-  if (globalVar.__router) return globalVar.__router;
+  if (globalVar.__reactRouterDataRouter && globalVar.__reactRouterRouteModules)
+    return {
+      router: globalVar.__reactRouterDataRouter,
+      routeModules: globalVar.__reactRouterRouteModules
+    };
   if (payload.type !== "render") throw new Error("Invalid payload type");
+  globalVar.__reactRouterRouteModules = globalVar.__reactRouterRouteModules ?? {};
+  populateRSCRouteModules(globalVar.__reactRouterRouteModules, payload.matches);
   let patches = /* @__PURE__ */ new Map();
   payload.patches?.forEach((patch) => {
     invariant(patch.parentId, "Invalid patch parentId");
@@ -1957,7 +2010,7 @@ function createRouterFromPayload({
     }
     return [route];
   }, []);
-  globalVar.__router = createRouter({
+  globalVar.__reactRouterDataRouter = createRouter({
     routes,
     unstable_getContext,
     basename: payload.basename,
@@ -1995,26 +2048,79 @@ function createRouterFromPayload({
     },
     // FIXME: Pass `build.ssr` into this function
     dataStrategy: getRSCSingleFetchDataStrategy(
-      () => globalVar.__router,
+      () => globalVar.__reactRouterDataRouter,
       true,
       payload.basename,
       createFromReadableStream,
       fetchImplementation
     )
   });
-  if (globalVar.__router.state.initialized) {
+  if (globalVar.__reactRouterDataRouter.state.initialized) {
     globalVar.__routerInitialized = true;
-    globalVar.__router.initialize();
+    globalVar.__reactRouterDataRouter.initialize();
   } else {
     globalVar.__routerInitialized = false;
   }
   let lastLoaderData = void 0;
-  globalVar.__router.subscribe(({ loaderData, actionData }) => {
+  globalVar.__reactRouterDataRouter.subscribe(({ loaderData, actionData }) => {
     if (lastLoaderData !== loaderData) {
       globalVar.__routerActionID = (globalVar.__routerActionID ?? (globalVar.__routerActionID = 0)) + 1;
     }
   });
-  return globalVar.__router;
+  globalVar.__reactRouterDataRouter._updateRoutesForHMR = (routeUpdateByRouteId) => {
+    const oldRoutes = window.__reactRouterDataRouter.routes;
+    const newRoutes = [];
+    function walkRoutes(routes2, parentId) {
+      return routes2.map((route) => {
+        const routeUpdate = routeUpdateByRouteId.get(route.id);
+        if (routeUpdate) {
+          const {
+            routeModule,
+            hasAction,
+            hasComponent,
+            hasErrorBoundary,
+            hasLoader
+          } = routeUpdate;
+          const newRoute = createRouteFromServerManifest({
+            clientAction: routeModule.clientAction,
+            clientLoader: routeModule.clientLoader,
+            element: route.element,
+            errorElement: route.errorElement,
+            handle: route.handle,
+            hasAction,
+            hasComponent,
+            hasErrorBoundary,
+            hasLoader,
+            hydrateFallbackElement: route.hydrateFallbackElement,
+            id: route.id,
+            index: route.index,
+            links: routeModule.links,
+            meta: routeModule.meta,
+            parentId,
+            path: route.path,
+            shouldRevalidate: routeModule.shouldRevalidate
+          });
+          if (route.children) {
+            newRoute.children = walkRoutes(route.children, route.id);
+          }
+          return newRoute;
+        }
+        const updatedRoute = { ...route };
+        if (route.children) {
+          updatedRoute.children = walkRoutes(route.children, route.id);
+        }
+        return updatedRoute;
+      });
+    }
+    newRoutes.push(
+      ...walkRoutes(oldRoutes, void 0)
+    );
+    window.__reactRouterDataRouter._internalSetRoutes(newRoutes);
+  };
+  return {
+    router: globalVar.__reactRouterDataRouter,
+    routeModules: globalVar.__reactRouterRouteModules
+  };
 }
 var renderedRoutesContext = unstable_createContext();
 function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, createFromReadableStream, fetchImplementation) {
@@ -2058,7 +2164,7 @@ function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, createFromReada
       const renderedRoutes = renderedRoutesById.get(match.route.id);
       if (renderedRoutes) {
         for (const rendered of renderedRoutes) {
-          window.__router.patchRoutes(
+          window.__reactRouterDataRouter.patchRoutes(
             rendered.parentId ?? null,
             [createRouteFromServerManifest(rendered)],
             true
@@ -2132,7 +2238,7 @@ function RSCHydratedRouter({
   unstable_getContext
 }) {
   if (payload.type !== "render") throw new Error("Invalid payload type");
-  let router = React4.useMemo(
+  let { router, routeModules } = React4.useMemo(
     () => createRouterFromPayload({
       payload,
       fetchImplementation,
@@ -2146,11 +2252,14 @@ function RSCHydratedRouter({
       unstable_getContext
     ]
   );
+  React4.useEffect(() => {
+    setIsHydrated();
+  }, []);
   React4.useLayoutEffect(() => {
     const globalVar = window;
     if (!globalVar.__routerInitialized) {
       globalVar.__routerInitialized = true;
-      globalVar.__router.initialize();
+      globalVar.__reactRouterDataRouter.initialize();
     }
   }, []);
   let [location2, setLocation] = React4.useState(router.state.location);
@@ -2216,7 +2325,7 @@ function RSCHydratedRouter({
       unstable_middleware: false,
       unstable_subResourceIntegrity: false
     },
-    isSpaMode: true,
+    isSpaMode: false,
     ssr: true,
     criticalCss: "",
     manifest: {
@@ -2229,7 +2338,7 @@ function RSCHydratedRouter({
       }
     },
     routeDiscovery: { mode: "lazy", manifestPath: "/__manifest" },
-    routeModules: {}
+    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 }))));
 }
@@ -2242,6 +2351,8 @@ function createRouteFromServerManifest(match, payload) {
   // the server loader flow regardless of whether the client loader calls
   // `serverLoader` or not, otherwise we'll have nothing to render.
   match.hasComponent && !match.element;
+  invariant(window.__reactRouterRouteModules);
+  populateRSCRouteModules(window.__reactRouterRouteModules, match);
   let dataRoute = {
     id: match.id,
     element: match.element,
@@ -2337,7 +2448,10 @@ function getManifestUrl(paths) {
     return new URL(`${paths[0]}.manifest`, window.location.origin);
   }
   const globalVar = window;
-  let basename = (globalVar.__router.basename ?? "").replace(/^\/|\/$/g, "");
+  let basename = (globalVar.__reactRouterDataRouter.basename ?? "").replace(
+    /^\/|\/$/g,
+    ""
+  );
   let url = new URL(`${basename}/.manifest`, window.location.origin);
   paths.sort().forEach((path) => url.searchParams.append("p", path));
   return url;
@@ -2363,7 +2477,7 @@ async function fetchAndApplyManifestPatches(paths, createFromReadableStream, fet
   }
   paths.forEach((p) => addToFifoQueue(p, discoveredPaths));
   payload.patches.forEach((p) => {
-    window.__router.patchRoutes(
+    window.__reactRouterDataRouter.patchRoutes(
       p.parentId ?? null,
       [createRouteFromServerManifest(p)]
     );
@@ -2640,7 +2754,7 @@ function RSCStaticRouter({ getPayload }) {
       }
     },
     routeDiscovery: { mode: "lazy", manifestPath: "/__manifest" },
-    routeModules: {}
+    routeModules: createRSCRouteModules(payload)
   };
   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,