@tanstack/react-router 1.91.2 → 1.91.3

package/dist/cjs/router.cjs

@@ -1570,8 +1570,13 @@ ${script}\`)` : ""}; if (typeof __TSR__ !== 'undefined') __TSR__.cleanScripts()<
       return;
     });
     const matches = [];
+    const getParentContext = (parentMatch) => {
+      const parentMatchId = parentMatch == null ? void 0 : parentMatch.id;
+      const parentContext = !parentMatchId ? this.options.context ?? {} : parentMatch.context ?? this.options.context ?? {};
+      return parentContext;
+    };
     matchedRoutes.forEach((route, index) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h;
+      var _a, _b, _c, _d;
       const parentMatch = matches[index - 1];
       const [preMatchSearch, searchError] = (() => {
         const parentSearch = (parentMatch == null ? void 0 : parentMatch.search) ?? next.search;
@@ -1654,17 +1659,8 @@ ${script}\`)` : ""}; if (typeof __TSR__ !== 'undefined') __TSR__.cleanScripts()<
           fullPath: route.fullPath
         };
       }
-      const headFnContent = (_d = (_c = route.options).head) == null ? void 0 : _d.call(_c, {
-        matches,
-        match,
-        params: match.params,
-        loaderData: match.loaderData ?? void 0
-      });
-      match.links = headFnContent == null ? void 0 : headFnContent.links;
-      match.scripts = headFnContent == null ? void 0 : headFnContent.scripts;
-      match.meta = headFnContent == null ? void 0 : headFnContent.meta;
       if (match.status === "success") {
-        match.headers = (_f = (_e = route.options).headers) == null ? void 0 : _f.call(_e, {
+        match.headers = (_d = (_c = route.options).headers) == null ? void 0 : _d.call(_c, {
           loaderData: match.loaderData
         });
       }
@@ -1672,18 +1668,25 @@ ${script}\`)` : ""}; if (typeof __TSR__ !== 'undefined') __TSR__.cleanScripts()<
         match.globalNotFound = globalNotFoundRouteId === route.id;
       }
       match.searchError = searchError;
-      const parentMatchId = parentMatch == null ? void 0 : parentMatch.id;
-      const parentContext = !parentMatchId ? this.options.context ?? {} : parentMatch.context ?? this.options.context ?? {};
+      const parentContext = getParentContext(parentMatch);
       match.context = {
         ...parentContext,
         ...match.__routeContext,
         ...match.__beforeLoadContext
       };
+      matches.push(match);
+    });
+    matches.forEach((match, index) => {
+      var _a, _b, _c, _d;
+      const route = this.looseRoutesById[match.routeId];
+      const existingMatch = this.getMatch(match.id);
       if (!existingMatch && (opts == null ? void 0 : opts._buildLocation) !== true) {
+        const parentMatch = matches[index - 1];
+        const parentContext = getParentContext(parentMatch);
         const contextFnContext = {
-          deps: loaderDeps,
+          deps: match.loaderDeps,
           params: match.params,
-          context: match.context,
+          context: parentContext,
           location: next,
           navigate: (opts2) => this.navigate({ ...opts2, _fromLocation: next }),
           buildLocation: this.buildLocation,
@@ -1692,14 +1695,22 @@ ${script}\`)` : ""}; if (typeof __TSR__ !== 'undefined') __TSR__.cleanScripts()<
           preload: !!match.preload,
           matches
         };
-        match.__routeContext = ((_h = (_g = route.options).context) == null ? void 0 : _h.call(_g, contextFnContext)) ?? {};
+        match.__routeContext = ((_b = (_a = route.options).context) == null ? void 0 : _b.call(_a, contextFnContext)) ?? {};
         match.context = {
           ...parentContext,
           ...match.__routeContext,
           ...match.__beforeLoadContext
         };
       }
-      matches.push(match);
+      const headFnContent = (_d = (_c = route.options).head) == null ? void 0 : _d.call(_c, {
+        matches,
+        match,
+        params: match.params,
+        loaderData: match.loaderData ?? void 0
+      });
+      match.links = headFnContent == null ? void 0 : headFnContent.links;
+      match.scripts = headFnContent == null ? void 0 : headFnContent.scripts;
+      match.meta = headFnContent == null ? void 0 : headFnContent.meta;
     });
     return matches;
   }