refactor: cascadeLoaderData move

TanStack · Nov 11, 2022 · b83fd3a · b83fd3a
1 parent d785a69
commit b83fd3a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 18 deletions.
diff --git a/examples/react/basic-ssr/src/App.tsx b/examples/react/basic-ssr/src/App.tsx
@@ -3,11 +3,7 @@ import { Outlet } from '@tanstack/react-router'
 
 import { router } from './router'
 
-console.log(router.state)
-
 export function App() {
-  console.log(router.state)
-
   return (
     // Build our routes and render our router
     <>

diff --git a/packages/router-core/src/route.ts b/packages/router-core/src/route.ts
@@ -228,16 +228,3 @@ export function createRoute<
 
   return route
 }
-
-export function cascadeLoaderData(matches: RouteMatch<any, any>[]) {
-  matches.forEach((match, index) => {
-    const parent = matches[index - 1]
-
-    if (parent) {
-      match.loaderData = replaceEqualDeep(match.loaderData, {
-        ...parent.loaderData,
-        ...match.routeLoaderData,
-      })
-    }
-  })
-}
diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts
@@ -23,7 +23,7 @@ import {
   matchPathname,
   resolvePath,
 } from './path'
-import { AnyRoute, cascadeLoaderData, createRoute, Route } from './route'
+import { AnyRoute, createRoute, Route } from './route'
 import {
   AnyLoaderData,
   AnyPathParams,
@@ -1282,3 +1282,16 @@ export function createRouter<
 function isCtrlEvent(e: MouseEvent) {
   return !!(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey)
 }
+
+function cascadeLoaderData(matches: RouteMatch<any, any>[]) {
+  matches.forEach((match, index) => {
+    const parent = matches[index - 1]
+
+    if (parent) {
+      match.loaderData = replaceEqualDeep(match.loaderData, {
+        ...parent.loaderData,
+        ...match.routeLoaderData,
+      })
+    }
+  })
+}