Add fetcherKey as parameter to patchRoutesOnNavigation (#13109)

Author: brophdawg11

.changeset/tokyo-manifest-drift.md

@@ -0,0 +1,7 @@
+---
+"@remix-run/router": minor
+"react-router": minor
+"react-router-dom": minor
+---
+
+Add `fetcherKey` as a parameter to `patchRoutesOnNavigation`

packages/router/router.ts

@@ -2266,7 +2266,8 @@ export function createRouter(init: RouterInit): Router {
       let discoverResult = await discoverRoutes(
         requestMatches,
         new URL(fetchRequest.url).pathname,
-        fetchRequest.signal
+        fetchRequest.signal,
+        key
       );
 
       if (discoverResult.type === "aborted") {
@@ -2558,7 +2559,8 @@ export function createRouter(init: RouterInit): Router {
       let discoverResult = await discoverRoutes(
         matches,
         new URL(fetchRequest.url).pathname,
-        fetchRequest.signal
+        fetchRequest.signal,
+        key
       );
 
       if (discoverResult.type === "aborted") {
@@ -3281,7 +3283,8 @@ export function createRouter(init: RouterInit): Router {
   async function discoverRoutes(
     matches: AgnosticDataRouteMatch[],
     pathname: string,
-    signal: AbortSignal
+    signal: AbortSignal,
+    fetcherKey?: string
   ): Promise<DiscoverRoutesResult> {
     if (!patchRoutesOnNavigationImpl) {
       return { type: "success", matches };
@@ -3297,6 +3300,7 @@ export function createRouter(init: RouterInit): Router {
           signal,
           path: pathname,
           matches: partialMatches,
+          fetcherKey,
           patch: (routeId, children) => {
             if (signal.aborted) return;
             patchRoutesImpl(

packages/router/utils.ts

@@ -262,6 +262,7 @@ export type AgnosticPatchRoutesOnNavigationFunctionArgs<
   signal: AbortSignal;
   path: string;
   matches: M[];
+  fetcherKey: string | undefined;
   patch: (routeId: string | null, children: O[]) => void;
 };