Skip to content

Commit 42d4a67

Browse files
ci: apply automated fixes
1 parent 33d9724 commit 42d4a67

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,6 @@ const executeBeforeLoad = (
371371
const parentMatchContext =
372372
parentMatch?.context ?? inner.router.options.context ?? undefined
373373

374-
375374
let isPending = false
376375
const pending = () => {
377376
if (isPending) return
@@ -425,7 +424,11 @@ const executeBeforeLoad = (
425424
params,
426425
preload,
427426
// Include parent's __beforeLoadContext so child routes can access it during their beforeLoad
428-
context: { ...parentMatchContext, ...parentMatch?.__beforeLoadContext, ...match.__routeContext },
427+
context: {
428+
...parentMatchContext,
429+
...parentMatch?.__beforeLoadContext,
430+
...match.__routeContext,
431+
},
429432
location: inner.location,
430433
navigate: (opts: any) =>
431434
inner.router.navigate({

0 commit comments

Comments
 (0)