react-router 7.14.2 → 7.15.1

package/dist/production/{chunk-2WLZNCK5.mjs → chunk-6S4627ZB.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.14.2
+ * react-router v7.15.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -22,6 +22,7 @@ import {
   SingleFetchRedirectSymbol,
   StaticRouterProvider,
   StreamTransfer,
+  URL_LIMIT,
   convertRoutesToDataRoutes,
   createMemoryRouter,
   createServerRoutes,
@@ -36,11 +37,13 @@ import {
   getStaticContextFromError,
   instrumentHandler,
   isDataWithResponseInit,
+  isMutationMethod,
   isRedirectResponse,
   isRedirectStatusCode,
   isResponse,
   isRouteErrorResponse,
   matchRoutes,
+  matchRoutesImpl,
   redirect,
   redirectDocument,
   replace,
@@ -51,7 +54,7 @@ import {
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-LK6U7ULH.mjs";
+} from "./chunk-JAKZPQZC.mjs";
 
 // lib/dom/ssr/server.tsx
 import * as React from "react";
@@ -86,7 +89,9 @@ function ServerRouter({
       delete context.staticHandlerContext.loaderData[routeId];
     }
   }
-  let router = createStaticRouter(routes, context.staticHandlerContext);
+  let router = createStaticRouter(routes, context.staticHandlerContext, {
+    branches: context.branches
+  });
   return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
     FrameworkContext.Provider,
     {
@@ -137,8 +142,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_passThroughRequests: future?.v8_passThroughRequests === true,
           v8_middleware: future?.v8_middleware === true,
           unstable_trailingSlashAwareDataRequests: future?.unstable_trailingSlashAwareDataRequests === true
         },
@@ -263,7 +267,7 @@ var unsign = async (cookie, secret) => {
     let signature = byteStringToUint8Array(atob(hash));
     let valid = await crypto.subtle.verify("HMAC", key, signature, data2);
     return valid ? value : false;
-  } catch (error) {
+  } catch (e) {
     return false;
   }
 };
@@ -355,7 +359,7 @@ function encodeData(value) {
 function decodeData(value) {
   try {
     return JSON.parse(decodeURIComponent(myEscape(atob(value))));
-  } catch (error) {
+  } catch (e) {
     return {};
   }
 }
@@ -490,29 +494,48 @@ function serializeErrors(errors, serverMode) {
   return serialized;
 }
 
+// lib/server-runtime/invariant.ts
+function invariant(value, message) {
+  if (value === false || value === null || typeof value === "undefined") {
+    console.error(
+      "The following error is a bug in React Router; please open an issue! https://github.com/remix-run/react-router/issues/new/choose"
+    );
+    throw new Error(message);
+  }
+}
+
 // lib/server-runtime/routeMatching.ts
-function matchServerRoutes(routes, pathname, basename) {
-  let matches = matchRoutes(
-    routes,
+function matchServerRoutes(manifest, dataRoutes, branches, pathname, basename) {
+  let matches = matchRoutesImpl(
+    dataRoutes,
     pathname,
-    basename
+    basename ?? "/",
+    false,
+    branches
   );
   if (!matches) return null;
-  return matches.map((match) => ({
-    params: match.params,
-    pathname: match.pathname,
-    route: match.route
-  }));
+  return matches.map((match) => {
+    let route = manifest[match.route.id];
+    invariant(
+      route,
+      `Route with id "${match.route.id}" not found in manifest.`
+    );
+    return {
+      params: match.params,
+      pathname: match.pathname,
+      route
+    };
+  });
 }
 
 // lib/server-runtime/data.ts
 async function callRouteHandler(handler, args, future) {
   let result = await handler({
-    request: future.unstable_passThroughRequests ? args.request : stripRoutesParam(stripIndexParam(args.request)),
-    unstable_url: args.unstable_url,
+    request: future.v8_passThroughRequests ? args.request : stripRoutesParam(stripIndexParam(args.request)),
+    url: args.url,
     params: args.params,
     context: args.context,
-    unstable_pattern: args.unstable_pattern
+    pattern: args.pattern
   });
   if (isDataWithResponseInit(result) && result.init && result.init.status && isRedirectStatusCode(result.init.status)) {
     throw new Response(null, result.init);
@@ -558,16 +581,6 @@ function stripRoutesParam(request) {
   return new Request(url.href, init);
 }
 
-// lib/server-runtime/invariant.ts
-function invariant(value, message) {
-  if (value === false || value === null || typeof value === "undefined") {
-    console.error(
-      "The following error is a bug in React Router; please open an issue! https://github.com/remix-run/react-router/issues/new/choose"
-    );
-    throw new Error(message);
-  }
-}
-
 // lib/server-runtime/dev.ts
 var globalDevServerHooksKey = "__reactRouterDevServerHooks";
 function setDevServerHooks(devServerHooks) {
@@ -602,12 +615,6 @@ function groupRoutesByParentId(manifest) {
   });
   return routes;
 }
-function createRoutes(manifest, parentId = "", routesByParentId = groupRoutesByParentId(manifest)) {
-  return (routesByParentId[parentId] || []).map((route) => ({
-    ...route,
-    children: createRoutes(manifest, route.id, routesByParentId)
-  }));
-}
 function createStaticHandlerDataRoutes(manifest, future, parentId = "", routesByParentId = groupRoutesByParentId(manifest)) {
   return (routesByParentId[parentId] || []).map((route) => {
     let commonRoute = {
@@ -894,7 +901,7 @@ async function singleFetchAction(build, serverMode, staticHandler, request, hand
     } catch (e) {
       return handleQueryError(new Error("Bad Request"), 400);
     }
-    let handlerRequest = build.future.unstable_passThroughRequests ? request : new Request(handlerUrl, {
+    let handlerRequest = build.future.v8_passThroughRequests ? request : new Request(handlerUrl, {
       method: request.method,
       body: request.body,
       headers: request.headers,
@@ -913,7 +920,7 @@ async function singleFetchAction(build, serverMode, staticHandler, request, hand
           return handleQueryError(error);
         }
       } : void 0,
-      unstable_normalizePath: (r) => getNormalizedPath(r, build.basename, build.future)
+      normalizePath: (r) => getNormalizedPath(r, build.basename, build.future)
     });
     return handleQueryResult(result);
   } catch (error) {
@@ -962,7 +969,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 = build.future.unstable_passThroughRequests ? request : new Request(handlerUrl, {
+    let handlerRequest = build.future.v8_passThroughRequests ? request : new Request(handlerUrl, {
       headers: request.headers,
       signal: request.signal
     });
@@ -978,7 +985,7 @@ async function singleFetchLoaders(build, serverMode, staticHandler, request, han
           return handleQueryError(error);
         }
       } : void 0,
-      unstable_normalizePath: (r) => getNormalizedPath(r, build.basename, build.future)
+      normalizePath: (r) => getNormalizedPath(r, build.basename, build.future)
     });
     return handleQueryResult(result);
   } catch (error) {
@@ -1145,12 +1152,12 @@ function encodeViaTurboStream(data2, requestSignal, streamTimeout, serverMode) {
 
 // lib/server-runtime/server.ts
 function derive(build, mode) {
-  let routes = createRoutes(build.routes);
   let dataRoutes = createStaticHandlerDataRoutes(build.routes, build.future);
   let serverMode = isServerMode(mode) ? mode : "production" /* Production */;
   let staticHandler = createStaticHandler(dataRoutes, {
     basename: build.basename,
-    unstable_instrumentations: build.entry.module.unstable_instrumentations
+    instrumentations: build.entry.module.instrumentations,
+    future: build.future
   });
   let errorHandler = build.entry.module.handleError || ((error, { request }) => {
     if (serverMode !== "test" /* Test */ && !request.signal.aborted) {
@@ -1247,24 +1254,30 @@ function derive(build, mode) {
     );
     if (requestUrl.pathname === manifestUrl) {
       try {
-        let res = await handleManifestRequest(build, routes, requestUrl);
+        let res = await handleManifestRequest(
+          build,
+          staticHandler.dataRoutes,
+          staticHandler._internalRouteBranches,
+          requestUrl
+        );
         return res;
       } catch (e) {
         handleError(e);
         return new Response("Unknown Server Error", { status: 500 });
       }
     }
-    let matches = matchServerRoutes(routes, normalizedPathname, build.basename);
+    let matches = matchServerRoutes(
+      build.routes,
+      staticHandler.dataRoutes,
+      staticHandler._internalRouteBranches,
+      normalizedPathname,
+      build.basename
+    );
     if (matches && matches.length > 0) {
       Object.assign(params, matches[0].params);
     }
     let response;
     if (requestUrl.pathname.endsWith(".data")) {
-      let singleFetchMatches = matchServerRoutes(
-        routes,
-        normalizedPathname,
-        build.basename
-      );
       response = await handleSingleFetchRequest(
         serverMode,
         build,
@@ -1285,7 +1298,7 @@ function derive(build, mode) {
       if (build.entry.module.handleDataRequest) {
         response = await build.entry.module.handleDataRequest(response, {
           context: loadContext,
-          params: singleFetchMatches ? singleFetchMatches[0].params : {},
+          params: matches ? matches[0].params : {},
           request
         });
         if (isRedirectResponse(response)) {
@@ -1335,15 +1348,13 @@ function derive(build, mode) {
     }
     return response;
   };
-  if (build.entry.module.unstable_instrumentations) {
+  if (build.entry.module.instrumentations) {
     requestHandler = instrumentHandler(
       requestHandler,
-      build.entry.module.unstable_instrumentations.map((i) => i.handler).filter(Boolean)
+      build.entry.module.instrumentations.map((i) => i.handler).filter(Boolean)
     );
   }
   return {
-    routes,
-    dataRoutes,
     serverMode,
     staticHandler,
     errorHandler,
@@ -1352,7 +1363,6 @@ function derive(build, mode) {
 }
 var createRequestHandler = (build, mode) => {
   let _build;
-  let routes;
   let serverMode;
   let staticHandler;
   let errorHandler;
@@ -1361,14 +1371,12 @@ var createRequestHandler = (build, mode) => {
     _build = typeof build === "function" ? await build() : build;
     if (typeof build === "function") {
       let derived = derive(_build, mode);
-      routes = derived.routes;
       serverMode = derived.serverMode;
       staticHandler = derived.staticHandler;
       errorHandler = derived.errorHandler;
       _requestHandler = derived.requestHandler;
-    } else if (!routes || !serverMode || !staticHandler || !errorHandler || !_requestHandler) {
+    } else if (!serverMode || !staticHandler || !errorHandler || !_requestHandler) {
       let derived = derive(_build, mode);
-      routes = derived.routes;
       serverMode = derived.serverMode;
       staticHandler = derived.staticHandler;
       errorHandler = derived.errorHandler;
@@ -1377,7 +1385,7 @@ var createRequestHandler = (build, mode) => {
     return _requestHandler(request, initialContext);
   };
 };
-async function handleManifestRequest(build, routes, url) {
+async function handleManifestRequest(build, dataRoutes, branches, url) {
   if (build.assets.version !== url.searchParams.get("version")) {
     return new Response(null, {
       status: 204,
@@ -1386,6 +1394,12 @@ async function handleManifestRequest(build, routes, url) {
       }
     });
   }
+  if (url.toString().length > URL_LIMIT) {
+    return new Response(null, {
+      statusText: "Bad Request",
+      status: 400
+    });
+  }
   let patches = {};
   if (url.searchParams.has("paths")) {
     let paths = /* @__PURE__ */ new Set();
@@ -1402,7 +1416,13 @@ async function handleManifestRequest(build, routes, url) {
       });
     });
     for (let path of paths) {
-      let matches = matchServerRoutes(routes, path, build.basename);
+      let matches = matchServerRoutes(
+        build.routes,
+        dataRoutes,
+        branches,
+        path,
+        build.basename
+      );
       if (matches) {
         for (let match of matches) {
           let routeId = match.route.id;
@@ -1424,7 +1444,7 @@ async function handleManifestRequest(build, routes, url) {
 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(
+  let response = isMutationMethod(request.method) ? await singleFetchAction(
     build,
     serverMode,
     staticHandler,
@@ -1445,7 +1465,7 @@ async function handleSingleFetchRequest(serverMode, build, staticHandler, reques
 }
 async function handleDocumentRequest(serverMode, build, staticHandler, request, loadContext, handleError, isSpaMode, criticalCss) {
   try {
-    if (request.method === "POST") {
+    if (isMutationMethod(request.method)) {
       try {
         throwIfPotentialCSRFAttack(
           request.headers,
@@ -1470,7 +1490,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
           return new Response(null, { status: 500 });
         }
       } : void 0,
-      unstable_normalizePath: (r) => getNormalizedPath(r, build.basename, build.future)
+      normalizePath: (r) => getNormalizedPath(r, build.basename, build.future)
     });
     if (!isResponse(result)) {
       result = await renderHtml(result, isSpaMode);
@@ -1507,6 +1527,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
     };
     let entryContext = {
       manifest: build.assets,
+      branches: staticHandler._internalRouteBranches,
       routeModules: createEntryRouteModules(build.routes),
       staticHandlerContext: context,
       criticalCss,
@@ -1603,7 +1624,7 @@ async function handleResourceRequest(serverMode, build, staticHandler, routeId,
           return handleQueryRouteError(error);
         }
       } : void 0,
-      unstable_normalizePath: (r) => getNormalizedPath(r, build.basename, build.future)
+      normalizePath: (r) => getNormalizedPath(r, build.basename, build.future)
     });
     return handleQueryRouteResult(result);
   } catch (error) {
@@ -1907,7 +1928,7 @@ async function writeRSCStream(rscStream, controller) {
           JSON.stringify(decoder.decode(chunk, { stream: true })),
           controller
         );
-      } catch (err) {
+      } catch (e) {
         let base64 = JSON.stringify(btoa(String.fromCodePoint(...chunk)));
         writeChunk(
           `Uint8Array.from(atob(${base64}), m => m.codePointAt(0))`,
@@ -2233,9 +2254,9 @@ async function routeRSCServerRequest({
       statusText,
       headers
     });
-  } catch (reason) {
-    if (reason instanceof Response) {
-      return reason;
+  } catch (error) {
+    if (error instanceof Response) {
+      return error;
     }
     if (renderRedirect) {
       return new Response(`Redirect: ${renderRedirect.location}`, {
@@ -2246,8 +2267,8 @@ async function routeRSCServerRequest({
       });
     }
     try {
-      reason = renderError ?? reason;
-      let [status, statusText] = isRouteErrorResponse(reason) ? [reason.status, reason.statusText] : [500, ""];
+      let normalizedError = renderError ?? error;
+      let [status, statusText] = isRouteErrorResponse(normalizedError) ? [normalizedError.status, normalizedError.statusText] : [500, ""];
       let retryRedirect;
       let reactHeaders = new Headers();
       const html = await renderHTML(
@@ -2259,7 +2280,7 @@ async function routeRSCServerRequest({
             (payload) => Object.assign(payload, {
               status,
               errors: deepestRenderedBoundaryId ? {
-                [deepestRenderedBoundaryId]: reason
+                [deepestRenderedBoundaryId]: normalizedError
               } : {}
             })
           );
@@ -2282,19 +2303,19 @@ async function routeRSCServerRequest({
           });
         },
         {
-          onError(error) {
-            if (typeof error === "object" && error && "digest" in error && typeof error.digest === "string") {
-              retryRedirect = decodeRedirectErrorDigest(error.digest);
+          onError(error2) {
+            if (typeof error2 === "object" && error2 && "digest" in error2 && typeof error2.digest === "string") {
+              retryRedirect = decodeRedirectErrorDigest(error2.digest);
               if (retryRedirect) {
-                return error.digest;
+                return error2.digest;
               }
               let routeErrorResponse = decodeRouteErrorResponseDigest(
-                error.digest
+                error2.digest
               );
               if (routeErrorResponse) {
                 status = routeErrorResponse.status;
                 statusText = routeErrorResponse.statusText;
-                return error.digest;
+                return error2.digest;
               }
             }
           },
@@ -2344,9 +2365,9 @@ async function routeRSCServerRequest({
         statusText,
         headers
       });
-    } catch {
+    } catch (error2) {
     }
-    throw reason;
+    throw error;
   }
 }
 function RSCStaticRouter({ getPayload }) {
@@ -2430,10 +2451,9 @@ function RSCStaticRouter({ getPayload }) {
       // These flags have no runtime impact so can always be false.  If we add
       // flags that drive runtime behavior they'll need to be proxied through.
       v8_middleware: false,
-      unstable_subResourceIntegrity: false,
       unstable_trailingSlashAwareDataRequests: true,
       // always on for RSC
-      unstable_passThroughRequests: true
+      v8_passThroughRequests: true
       // always on for RSC
     },
     isSpaMode: false,