react-router 7.14.1 → 7.15.0

package/dist/development/index.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.14.1
+ * react-router v7.15.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -28,7 +28,7 @@ import {
   isSession,
   routeRSCServerRequest,
   setDevServerHooks
-} from "./chunk-BFXCU3MI.mjs";
+} from "./chunk-RMD3H4O3.mjs";
 import {
   Action,
   Await,
@@ -141,7 +141,7 @@ import {
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-OE4NN4TA.mjs";
+} from "./chunk-5KNZJZUH.mjs";
 export {
   Await,
   BrowserRouter,

package/dist/{production/instrumentation-CMVbvxj9.d.ts → development/instrumentation-DlJ2QV7d.d.ts}

@@ -1,4 +1,4 @@
-import { e as RouteObject, f as History, g as MaybePromise, c as RouterContextProvider, h as MapRoutePropertiesFunction, i as Action, L as Location, D as DataRouteMatch, j as Submission, k as RouteData, l as DataStrategyFunction, m as PatchRoutesOnNavigationFunction, n as DataRouteObject, U as UIMatch, T as To, o as HTMLFormMethod, F as FormEncType, p as Path, q as LoaderFunctionArgs, r as MiddlewareEnabled, s as AppLoadContext } from './routeModules-CM_clkdE.js';
+import { e as RouteObject, f as History, g as MaybePromise, c as RouterContextProvider, h as MapRoutePropertiesFunction, i as Action, L as Location, D as DataRouteMatch, j as Submission, k as RouteData, l as DataStrategyFunction, m as PatchRoutesOnNavigationFunction, n as DataRouteObject, o as RouteBranch, p as RouteManifest, U as UIMatch, T as To, q as HTMLFormMethod, F as FormEncType, r as Path, s as LoaderFunctionArgs, t as MiddlewareEnabled, u as AppLoadContext } from './data-BqZ2x964.js';
 
 /**
  * A Router instance manages all navigation and data loading/mutations
@@ -32,6 +32,20 @@ interface Router {
      * Return the routes for this router instance
      */
     get routes(): DataRouteObject[];
+    /**
+     * @private
+     * PRIVATE - DO NOT USE
+     *
+     * Return the route branches for this router instance
+     */
+    get branches(): RouteBranch<DataRouteObject>[] | undefined;
+    /**
+     * @private
+     * PRIVATE - DO NOT USE
+     *
+     * Return the manifest for this router instance
+     */
+    get manifest(): RouteManifest;
     /**
      * @private
      * PRIVATE - DO NOT USE
@@ -279,7 +293,6 @@ type HydrationState = Partial<Pick<RouterState, "loaderData" | "actionData" | "e
  * Future flags to toggle new feature behavior
  */
 interface FutureConfig {
-    unstable_passThroughRequests: boolean;
 }
 /**
  * Initialization options for createRouter
@@ -289,7 +302,7 @@ interface RouterInit {
     history: History;
     basename?: string;
     getContext?: () => MaybePromise<RouterContextProvider>;
-    unstable_instrumentations?: unstable_ClientInstrumentation[];
+    instrumentations?: ClientInstrumentation[];
     mapRouteProperties?: MapRoutePropertiesFunction;
     future?: Partial<FutureConfig>;
     hydrationRouteProperties?: string[];
@@ -317,7 +330,33 @@ interface StaticHandlerContext {
  * A StaticHandler instance manages a singular SSR navigation/fetch event
  */
 interface StaticHandler {
+    /**
+     * The set of data routes managed by this handler
+     */
     dataRoutes: DataRouteObject[];
+    /**
+     * @private
+     * PRIVATE - DO NOT USE
+     *
+     * The route branches derived from the data routes, used for internal route
+     * matching in Framework Mode
+     */
+    _internalRouteBranches: RouteBranch<DataRouteObject>[];
+    /**
+     * Perform a query for a given request - executing all matched route
+     * loaders/actions.  Used for document requests.
+     *
+     * @param request The request to query
+     * @param opts Optional query options
+     * @param opts.dataStrategy Alternate dataStrategy implementation
+     * @param opts.filterMatchesToLoad Predicate function to filter which matches should be loaded
+     * @param opts.generateMiddlewareResponse To enable middleware, provide a function
+     * to generate a response to bubble back up the middleware chain
+     * @param opts.requestContext Context object to pass to loaders/actions
+     * @param opts.skipLoaderErrorBubbling Skip loader error bubbling
+     * @param opts.skipRevalidation Skip revalidation after action submission
+     * @param opts.normalizePath Normalize the request path
+     */
     query(request: Request, opts?: {
         requestContext?: unknown;
         filterMatchesToLoad?: (match: DataRouteMatch) => boolean;
@@ -327,14 +366,27 @@ interface StaticHandler {
         generateMiddlewareResponse?: (query: (r: Request, args?: {
             filterMatchesToLoad?: (match: DataRouteMatch) => boolean;
         }) => Promise<StaticHandlerContext | Response>) => MaybePromise<Response>;
-        unstable_normalizePath?: (request: Request) => Path;
+        normalizePath?: (request: Request) => Path;
     }): Promise<StaticHandlerContext | Response>;
+    /**
+     * Perform a query for a specific route.  Used for resource requests.
+     *
+     * @param request The request to query
+     * @param opts Optional queryRoute options
+     * @param opts.dataStrategy Alternate dataStrategy implementation
+     * @param opts.generateMiddlewareResponse To enable middleware, provide a function
+     * to generate a response to bubble back up the middleware chain
+     * @param opts.requestContext Context object to pass to loaders/actions
+     * @param opts.routeId The ID of the route to query
+     * @param opts.normalizePath Normalize the request path
+  
+     */
     queryRoute(request: Request, opts?: {
         routeId?: string;
         requestContext?: unknown;
         dataStrategy?: DataStrategyFunction<unknown>;
         generateMiddlewareResponse?: (queryRoute: (r: Request) => Promise<Response>) => MaybePromise<Response>;
-        unstable_normalizePath?: (request: Request) => Path;
+        normalizePath?: (request: Request) => Path;
     }): Promise<any>;
 }
 type ViewTransitionOpts = {
@@ -378,14 +430,14 @@ type BaseNavigateOrFetchOptions = {
     preventScrollReset?: boolean;
     relative?: RelativeRoutingType;
     flushSync?: boolean;
-    unstable_defaultShouldRevalidate?: boolean;
+    defaultShouldRevalidate?: boolean;
 };
 type BaseNavigateOptions = BaseNavigateOrFetchOptions & {
     replace?: boolean;
     state?: any;
     fromRouteId?: string;
     viewTransition?: boolean;
-    unstable_mask?: To;
+    mask?: To;
 };
 type BaseSubmissionOptions = {
     formMethod?: HTMLFormMethod;
@@ -568,29 +620,29 @@ declare function createRouter(init: RouterInit): Router;
 interface CreateStaticHandlerOptions {
     basename?: string;
     mapRouteProperties?: MapRoutePropertiesFunction;
-    unstable_instrumentations?: Pick<unstable_ServerInstrumentation, "route">[];
+    instrumentations?: Pick<ServerInstrumentation, "route">[];
     future?: Partial<FutureConfig>;
 }
 
-type unstable_ServerInstrumentation = {
-    handler?: unstable_InstrumentRequestHandlerFunction;
-    route?: unstable_InstrumentRouteFunction;
+type ServerInstrumentation = {
+    handler?: InstrumentRequestHandlerFunction;
+    route?: InstrumentRouteFunction;
 };
-type unstable_ClientInstrumentation = {
-    router?: unstable_InstrumentRouterFunction;
-    route?: unstable_InstrumentRouteFunction;
+type ClientInstrumentation = {
+    router?: InstrumentRouterFunction;
+    route?: InstrumentRouteFunction;
 };
-type unstable_InstrumentRequestHandlerFunction = (handler: InstrumentableRequestHandler) => void;
-type unstable_InstrumentRouterFunction = (router: InstrumentableRouter) => void;
-type unstable_InstrumentRouteFunction = (route: InstrumentableRoute) => void;
-type unstable_InstrumentationHandlerResult = {
+type InstrumentRequestHandlerFunction = (handler: InstrumentableRequestHandler) => void;
+type InstrumentRouterFunction = (router: InstrumentableRouter) => void;
+type InstrumentRouteFunction = (route: InstrumentableRoute) => void;
+type InstrumentationHandlerResult = {
     status: "success";
     error: undefined;
 } | {
     status: "error";
     error: Error;
 };
-type InstrumentFunction<T> = (handler: () => Promise<unstable_InstrumentationHandlerResult>, info: T) => Promise<void>;
+type InstrumentFunction<T> = (handler: () => Promise<InstrumentationHandlerResult>, info: T) => Promise<void>;
 type ReadonlyRequest = {
     method: string;
     url: string;
@@ -616,7 +668,7 @@ type RouteLazyInstrumentationInfo = undefined;
 type RouteHandlerInstrumentationInfo = Readonly<{
     request: ReadonlyRequest;
     params: LoaderFunctionArgs["params"];
-    unstable_pattern: string;
+    pattern: string;
     context: ReadonlyContext;
 }>;
 type InstrumentableRouter = {
@@ -654,4 +706,4 @@ type RequestHandlerInstrumentationInfo = Readonly<{
     context: ReadonlyContext | undefined;
 }>;
 
-export { type BlockerFunction as B, type CreateStaticHandlerOptions as C, type Fetcher as F, type GetScrollPositionFunction as G, type HydrationState as H, IDLE_NAVIGATION as I, type Navigation as N, type RouterInit as R, type StaticHandler as S, type Router as a, type Blocker as b, type RelativeRoutingType as c, type RouterState as d, type GetScrollRestorationKeyFunction as e, type StaticHandlerContext as f, type NavigationStates as g, type RouterSubscriber as h, type RouterNavigateOptions as i, type RouterFetchOptions as j, type RevalidationState as k, type unstable_ServerInstrumentation as l, type unstable_InstrumentRequestHandlerFunction as m, type unstable_InstrumentRouterFunction as n, type unstable_InstrumentRouteFunction as o, type unstable_InstrumentationHandlerResult as p, IDLE_FETCHER as q, IDLE_BLOCKER as r, createRouter as s, type FutureConfig as t, type unstable_ClientInstrumentation as u };
+export { type BlockerFunction as B, type ClientInstrumentation as C, type Fetcher as F, type GetScrollPositionFunction as G, type HydrationState as H, type InstrumentRequestHandlerFunction as I, type Navigation as N, type RouterInit as R, type StaticHandler as S, type Router as a, type Blocker as b, type RelativeRoutingType as c, type RouterState as d, type GetScrollRestorationKeyFunction as e, type StaticHandlerContext as f, type NavigationStates as g, type RouterSubscriber as h, type RouterNavigateOptions as i, type RouterFetchOptions as j, type RevalidationState as k, type ServerInstrumentation as l, type InstrumentRouterFunction as m, type InstrumentRouteFunction as n, type InstrumentationHandlerResult as o, IDLE_NAVIGATION as p, IDLE_FETCHER as q, IDLE_BLOCKER as r, createRouter as s, type FutureConfig as t, type CreateStaticHandlerOptions as u };

package/dist/development/lib/types/internal.d.mts

@@ -1,5 +1,5 @@
-import { R as RouteModule, e as LinkDescriptor, L as Location, F as Func, f as Pretty, g as MetaDescriptor, G as GetLoaderData, h as ServerDataFunctionArgs, i as MiddlewareNextFunction, j as ClientDataFunctionArgs, D as DataStrategyResult, k as ServerDataFrom, N as Normalize, l as GetActionData } from '../../routeModules-Djumx26z.mjs';
-import { R as RouteFiles, P as Pages } from '../../register-aE9ob3TK.mjs';
+import { R as RouteModule, e as LinkDescriptor, L as Location, F as Func, f as Pretty, g as MetaDescriptor, G as GetLoaderData, h as ServerDataFunctionArgs, i as MiddlewareNextFunction, j as ClientDataFunctionArgs, D as DataStrategyResult, k as ServerDataFrom, N as Normalize, l as GetActionData } from '../../data-BVUf681J.mjs';
+import { R as RouteFiles, P as Pages } from '../../register-Df8okEea.mjs';
 import 'react';
 
 type MaybePromise<T> = T | Promise<T>;

package/dist/development/lib/types/internal.d.ts

@@ -1,5 +1,5 @@
-import { R as RouteModule, t as LinkDescriptor, L as Location, u as Func, v as Pretty, w as MetaDescriptor, G as GetLoaderData, x as ServerDataFunctionArgs, y as MiddlewareNextFunction, z as ClientDataFunctionArgs, B as DataStrategyResult, E as ServerDataFrom, N as Normalize, I as GetActionData } from '../../routeModules-CM_clkdE.js';
-import { R as RouteFiles, P as Pages } from '../../register-D1WlEpq9.js';
+import { R as RouteModule, v as LinkDescriptor, L as Location, w as Func, x as Pretty, y as MetaDescriptor, G as GetLoaderData, z as ServerDataFunctionArgs, B as MiddlewareNextFunction, E as ClientDataFunctionArgs, I as DataStrategyResult, J as ServerDataFrom, N as Normalize, K as GetActionData } from '../../data-BqZ2x964.js';
+import { R as RouteFiles, P as Pages } from '../../register-Bsscfj79.js';
 import 'react';
 
 type MaybePromise<T> = T | Promise<T>;

package/dist/development/lib/types/internal.js

@@ -1,5 +1,5 @@
 "use strict";/**
- * react-router v7.14.1
+ * react-router v7.15.0
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/lib/types/internal.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.14.1
+ * react-router v7.15.0
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/{register-D1WlEpq9.d.ts → register-Bsscfj79.d.ts}

@@ -1,4 +1,4 @@
-import { R as RouteModule } from './routeModules-CM_clkdE.js';
+import { R as RouteModule } from './data-BqZ2x964.js';
 
 /**
  * Apps can use this interface to "register" app-wide types for React Router via interface declaration merging and module augmentation.

package/dist/{production/register-D1WlEpq9.d.ts → development/register-Df8okEea.d.mts}

@@ -1,4 +1,4 @@
-import { R as RouteModule } from './routeModules-CM_clkdE.js';
+import { R as RouteModule } from './data-BVUf681J.mjs';
 
 /**
  * Apps can use this interface to "register" app-wide types for React Router via interface declaration merging and module augmentation.

package/dist/production/{browser-CtktEGQs.d.ts → browser-CRsXgNrY.d.mts}

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { R as RouterInit } from './instrumentation-CMVbvxj9.js';
-import { L as Location, C as ClientActionFunction, a as ClientLoaderFunction, b as LinksFunction, M as MetaFunction, S as ShouldRevalidateFunction, P as Params, c as RouterContextProvider, A as ActionFunction, H as HeadersFunction, d as LoaderFunction } from './routeModules-CM_clkdE.js';
+import { R as RouterInit } from './context-BQs41HrG.mjs';
+import { L as Location, C as ClientActionFunction, a as ClientLoaderFunction, b as LinksFunction, M as MetaFunction, S as ShouldRevalidateFunction, P as Params, c as RouterContextProvider, A as ActionFunction, H as HeadersFunction, d as LoaderFunction } from './data-BVUf681J.mjs';
 
 declare function getRequest(): Request;
 type RSCRouteConfigEntryBase = {

package/dist/{development/browser-CtktEGQs.d.ts → production/browser-wDl1FZEL.d.ts}

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { R as RouterInit } from './instrumentation-CMVbvxj9.js';
-import { L as Location, C as ClientActionFunction, a as ClientLoaderFunction, b as LinksFunction, M as MetaFunction, S as ShouldRevalidateFunction, P as Params, c as RouterContextProvider, A as ActionFunction, H as HeadersFunction, d as LoaderFunction } from './routeModules-CM_clkdE.js';
+import { R as RouterInit } from './instrumentation-DlJ2QV7d.js';
+import { L as Location, C as ClientActionFunction, a as ClientLoaderFunction, b as LinksFunction, M as MetaFunction, S as ShouldRevalidateFunction, P as Params, c as RouterContextProvider, A as ActionFunction, H as HeadersFunction, d as LoaderFunction } from './data-BqZ2x964.js';
 
 declare function getRequest(): Request;
 type RSCRouteConfigEntryBase = {

package/dist/production/{chunk-G5ZWO7Q6.mjs → chunk-23ZOHYE5.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.14.1
+ * react-router v7.15.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -22,6 +22,7 @@ import {
   SingleFetchRedirectSymbol,
   StaticRouterProvider,
   StreamTransfer,
+  URL_LIMIT,
   convertRoutesToDataRoutes,
   createMemoryRouter,
   createServerRoutes,
@@ -41,6 +42,7 @@ import {
   isResponse,
   isRouteErrorResponse,
   matchRoutes,
+  matchRoutesImpl,
   redirect,
   redirectDocument,
   replace,
@@ -51,7 +53,7 @@ import {
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-SPR7R4GU.mjs";
+} from "./chunk-GM3PW4GX.mjs";
 
 // lib/dom/ssr/server.tsx
 import * as React from "react";
@@ -86,7 +88,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 +141,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
         },
@@ -490,29 +493,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 +580,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) {
@@ -579,7 +591,7 @@ function getDevServerHooks() {
 function getBuildTimeHeader(request, headerName) {
   if (typeof process !== "undefined") {
     try {
-      if (process.env?.IS_RR_BUILD_REQUEST === "yes") {
+      if (process.env.hasOwnProperty("IS_RR_BUILD_REQUEST") && process.env.IS_RR_BUILD_REQUEST === "yes") {
         return request.headers.get(headerName);
       }
     } catch (e) {
@@ -602,12 +614,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 +900,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 +919,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 +968,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 +984,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 +1151,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 +1253,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 +1297,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 +1347,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 +1362,6 @@ function derive(build, mode) {
 }
 var createRequestHandler = (build, mode) => {
   let _build;
-  let routes;
   let serverMode;
   let staticHandler;
   let errorHandler;
@@ -1361,14 +1370,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 +1384,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 +1393,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 +1415,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;
@@ -1470,7 +1489,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 +1526,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 +1623,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) {
@@ -2430,10 +2450,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,