react-router 0.0.0-experimental-e87ed2fd4 → 0.0.0-experimental-e7eb25a7b

package/dist/production/rsc-export.mjs

@@ -1,9 +1,9 @@
-import { parse, serialize } from 'cookie';
+import { serialize, parse } from 'cookie';
 import * as React from 'react';
 import { splitCookiesString } from 'set-cookie-parser';
 
 /**
- * react-router v0.0.0-experimental-e87ed2fd4
+ * react-router v0.0.0-experimental-e7eb25a7b
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -39,7 +39,7 @@ function createKey() {
 }
 function createLocation(current, to, state = null, key) {
   let location = {
-    pathname: typeof current === "string" ? current : current.pathname,
+    pathname: "string" === "string" ? current : current.pathname,
     search: "",
     hash: "",
     ...typeof to === "string" ? parsePath(to) : to,
@@ -1484,10 +1484,9 @@ async function runMiddlewarePipeline(args, propagateResult, handler, errorHandle
       middlewareState.middlewareError.error,
       middlewareState.middlewareError.routeId
     );
-    if (propagateResult || !middlewareState.handlerResult) {
+    {
       return result;
     }
-    return Object.assign(middlewareState.handlerResult, result);
   }
 }
 async function callRouteMiddleware(args, middlewares, propagateResult, middlewareState, handler, idx = 0) {
@@ -1521,7 +1520,7 @@ async function callRouteMiddleware(args, middlewares, propagateResult, middlewar
       handler,
       idx + 1
     );
-    if (propagateResult) {
+    {
       nextResult = result;
       return nextResult;
     }
@@ -2454,19 +2453,28 @@ async function matchRSCServerRequest({
 }
 async function generateManifestResponse(routes, request, generateResponse) {
   let url = new URL(request.url);
-  let matches = matchRoutes(routes, url.pathname.replace(/\.manifest$/, ""));
+  let pathnameParams = url.searchParams.getAll("p");
+  let pathnames = pathnameParams.length ? pathnameParams : [url.pathname.replace(/\.manifest$/, "")];
+  let routeIds = /* @__PURE__ */ new Set();
+  let matchedRoutes = pathnames.flatMap((pathname) => {
+    let pathnameMatches = matchRoutes(routes, pathname);
+    return pathnameMatches?.map((m, i) => ({
+      ...m.route,
+      parentId: pathnameMatches[i - 1]?.route.id
+    })) ?? [];
+  }).filter((route) => {
+    if (!routeIds.has(route.id)) {
+      routeIds.add(route.id);
+      return true;
+    }
+    return false;
+  });
   let payload = {
     type: "manifest",
-    matches: await Promise.all(
-      matches?.map(
-        (m, i) => getManifestRoute(m.route, matches[i - 1]?.route.id)
-      ) ?? []
-    ),
-    patches: await getAdditionalRoutePatches(
-      url.pathname,
-      routes,
-      matches?.map((m) => m.route.id) ?? []
-    )
+    patches: (await Promise.all([
+      ...matchedRoutes.map((route) => getManifestRoute(route)),
+      getAdditionalRoutePatches(pathnames, routes, Array.from(routeIds))
+    ])).flat(1)
   };
   return generateResponse({
     statusCode: 200,
@@ -2533,7 +2541,11 @@ async function generateRenderResponse(request, routes, decodeCallServer, decodeF
   if (matches) {
     await Promise.all(matches.map((m) => explodeLazyRoute(m.route)));
   }
-  const handler = createStaticHandler(routes);
+  const handler = createStaticHandler(routes, {
+    mapRouteProperties: (r) => ({
+      hasErrorBoundary: r.ErrorBoundary != null
+    })
+  });
   const result = await handler.query(request, {
     skipLoaderErrorBubbling: isDataRequest,
     skipRevalidation: isSubmission,
@@ -2671,7 +2683,7 @@ async function getRenderPayload(baseRenderPayload, routes, routeIdsToLoad, isDat
     })
   );
   let patchesPromise = !isDataRequest ? getAdditionalRoutePatches(
-    staticContext.location.pathname,
+    [staticContext.location.pathname],
     routes,
     staticContext.matches.map((m) => m.route.id)
   ) : void 0;
@@ -2767,7 +2779,7 @@ async function getServerRouteMatch(staticContext, match, shouldRenderComponent,
     shouldRevalidate: match.route.shouldRevalidate
   };
 }
-async function getManifestRoute(route, parentId) {
+async function getManifestRoute(route) {
   await explodeLazyRoute(route);
   const Layout = route.Layout || React.Fragment;
   const errorElement = route.ErrorBoundary ? React.createElement(
@@ -2784,7 +2796,7 @@ async function getManifestRoute(route, parentId) {
     errorElement,
     hasLoader: !!route.loader,
     id: route.id,
-    parentId,
+    parentId: route.parentId,
     path: route.path,
     index: "index" in route ? route.index : void 0,
     links: route.links,
@@ -2800,26 +2812,36 @@ async function explodeLazyRoute(route) {
     route.lazy = void 0;
   }
 }
-async function getAdditionalRoutePatches(pathname, routes, matchedRouteIds) {
+async function getAdditionalRoutePatches(pathnames, routes, matchedRouteIds) {
   let patchRouteMatches = /* @__PURE__ */ new Map();
-  let segments = pathname.split("/").filter(Boolean);
-  let paths = ["/"];
-  segments.pop();
-  while (segments.length > 0) {
-    paths.push(`/${segments.join("/")}`);
+  let matchedPaths = /* @__PURE__ */ new Set();
+  for (const pathname of pathnames) {
+    let segments = pathname.split("/").filter(Boolean);
+    let paths = ["/"];
     segments.pop();
+    while (segments.length > 0) {
+      paths.push(`/${segments.join("/")}`);
+      segments.pop();
+    }
+    paths.forEach((path) => {
+      if (matchedPaths.has(path)) {
+        return;
+      }
+      matchedPaths.add(path);
+      let matches = matchRoutes(routes, path) || [];
+      matches.forEach((m, i) => {
+        if (patchRouteMatches.get(m.route.id)) {
+          return;
+        }
+        patchRouteMatches.set(m.route.id, {
+          ...m.route,
+          parentId: matches[i - 1]?.route.id
+        });
+      });
+    });
   }
-  paths.forEach((path) => {
-    let matches = matchRoutes(routes, path) || [];
-    matches.forEach(
-      (m, i) => patchRouteMatches.set(m.route.id, {
-        ...m.route,
-        parentId: matches[i - 1]?.route.id
-      })
-    );
-  });
   let patches = await Promise.all(
-    [...patchRouteMatches.values()].filter((route) => !matchedRouteIds.some((id) => id === route.id)).map((route) => getManifestRoute(route, route.parentId))
+    [...patchRouteMatches.values()].filter((route) => !matchedRouteIds.some((id) => id === route.id)).map((route) => getManifestRoute(route))
   );
   return patches;
 }
@@ -2831,4 +2853,4 @@ function canDecodeWithFormData(contentType) {
   return contentType.match(/\bapplication\/x-www-form-urlencoded\b/) || contentType.match(/\bmultipart\/form-data\b/);
 }
 
-export { createCookie, createCookieSessionStorage, createMemorySessionStorage, createSession, createSessionStorage, createStaticHandler, data, isCookie, isSession, matchRSCServerRequest, matchRoutes, redirect, redirectDocument, replace, unstable_createContext };
+export { createCookie, createCookieSessionStorage, createMemorySessionStorage, createSession, createSessionStorage, createStaticHandler, data, isCookie, isSession, matchRoutes, redirect, redirectDocument, replace, unstable_createContext, matchRSCServerRequest as unstable_matchRSCServerRequest };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router",
-  "version": "0.0.0-experimental-e87ed2fd4",
+  "version": "0.0.0-experimental-e7eb25a7b",
   "description": "Declarative routing for React",
   "keywords": [
     "react",