use match.__beforeLoadContext

Author: birkskyum

packages/router-core/src/Matches.ts

@@ -148,8 +148,6 @@ export interface RouteMatch<
     displayPendingPromise?: Promise<void>
     minPendingPromise?: ControlledPromise<void>
     dehydrated?: boolean
-    /** @internal - Stored non-reactively so it can be read immediately even during transitions */
-    __beforeLoadContext?: Record<string, unknown>
     /** @internal - Stored non-reactively so redirect/notFound errors are immediately accessible even during transitions */
     error?: unknown
   }

packages/router-core/src/load-matches.ts

@@ -454,7 +454,7 @@ const executeBeforeLoad = (
       // Store __beforeLoadContext non-reactively so it's immediately readable even during transitions
       const match = inner.router.getMatch(matchId)
       if (match) {
-        match._nonReactive.__beforeLoadContext = beforeLoadContext
+        match.__beforeLoadContext = beforeLoadContext
       }
       inner.updateMatch(matchId, (prev) => ({
         ...prev,
@@ -582,7 +582,7 @@ const getLoaderContext = (
     context = {
       ...context,
       ...(m.__routeContext ?? {}),
-      ...(m._nonReactive.__beforeLoadContext ?? {}),
+      ...(m.__beforeLoadContext ?? {}),
     }
   }
 

packages/router-core/src/router.ts

@@ -1454,7 +1454,6 @@ export class RouterCore<
           __routeContext: undefined,
           _nonReactive: {
             loadPromise: createControlledPromise(),
-            __beforeLoadContext: undefined,
             error: (existingMatch as any)?._nonReactive?.error,
           },
           __beforeLoadContext: undefined,
@@ -1489,7 +1488,7 @@ export class RouterCore<
       match.context = {
         ...parentContext,
         ...match.__routeContext,
-        ...match._nonReactive.__beforeLoadContext,
+        ...match.__beforeLoadContext,
       }
 
       matches.push(match)
@@ -1529,7 +1528,7 @@ export class RouterCore<
         match.context = {
           ...parentContext,
           ...match.__routeContext,
-          ...match._nonReactive.__beforeLoadContext,
+          ...match.__beforeLoadContext,
         }
       }
     })
@@ -2298,7 +2297,7 @@ export class RouterCore<
 
   updateMatch: UpdateMatchFn = (id, updater) => {
     // Wrap in startTransition to prevent Suspense fallbacks
-    // Context is stored in _nonReactive.__beforeLoadContext so it's immediately readable
+    // Context is stored in .__beforeLoadContext so it's immediately readable
     this.startTransition(() => {
       const matchesKey = this.state.pendingMatches?.some((d) => d.id === id)
         ? 'pendingMatches'

packages/router-core/src/ssr/ssr-client.ts

@@ -32,7 +32,6 @@ function hydrateMatch(
   deyhydratedMatch: DehydratedMatch,
 ): void {
   match.id = deyhydratedMatch.i
-  match._nonReactive.__beforeLoadContext = deyhydratedMatch.b
   match.__beforeLoadContext = deyhydratedMatch.b
   match.loaderData = deyhydratedMatch.l
   match.status = deyhydratedMatch.s
@@ -174,14 +173,14 @@ export async function hydrate(router: AnyRouter): Promise<any> {
       const route = router.looseRoutesById[match.routeId]!
 
       // Build parent context by accumulating from all ancestors
-      // We read from _nonReactive.__beforeLoadContext to avoid issues during transitions
+      // We read from __beforeLoadContext to avoid issues during transitions
       let parentContext = router.options.context ?? {}
       for (let i = 0; i < match.index; i++) {
         const ancestorMatch = router.state.matches[i]!
         parentContext = {
           ...parentContext,
           ...ancestorMatch.__routeContext,
-          ...ancestorMatch._nonReactive.__beforeLoadContext,
+          ...ancestorMatch.__beforeLoadContext,
         }
       }
 
@@ -208,7 +207,7 @@ export async function hydrate(router: AnyRouter): Promise<any> {
       match.context = {
         ...parentContext,
         ...match.__routeContext,
-        ...match._nonReactive.__beforeLoadContext,
+        ...match.__beforeLoadContext,
       }
 
       const assetContext = {

packages/router-core/src/ssr/ssr-server.ts

@@ -33,8 +33,8 @@ export function dehydrateMatch(match: AnyRouteMatch): DehydratedMatch {
     s: match.status,
   }
 
-  if (match._nonReactive.__beforeLoadContext !== undefined) {
-    dehydratedMatch.b = match._nonReactive.__beforeLoadContext
+  if (match.__beforeLoadContext !== undefined) {
+    dehydratedMatch.b = match.__beforeLoadContext
   }
 
   const properties = [