From 90559fc41a09109b9f7320676c20b1844f547cee Mon Sep 17 00:00:00 2001
From: Brenley Dueck <brenleydueck@gmail.com>
Date: Tue, 21 Oct 2025 08:54:21 -0500
Subject: [PATCH] move hydrate call inside shared packages

---
 packages/solid-start-client/src/StartClient.tsx   | 8 ++++++++
 packages/solid-start-client/src/index.tsx         | 3 +--
 packages/solid-start/src/default-entry/client.tsx | 8 ++------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/solid-start-client/src/StartClient.tsx b/packages/solid-start-client/src/StartClient.tsx
index 88fd53e7325..12860d7b3ea 100644
--- a/packages/solid-start-client/src/StartClient.tsx
+++ b/packages/solid-start-client/src/StartClient.tsx
@@ -1,6 +1,14 @@
 import { RouterProvider } from '@tanstack/solid-router'
+import { hydrateStart } from '@tanstack/start-client-core/client'
+import { hydrate } from 'solid-js/web'
 import type { AnyRouter } from '@tanstack/router-core'
 
 export function StartClient(props: { router: AnyRouter }) {
   return <RouterProvider router={props.router} />
 }
+
+export function clientHydrate() {
+  hydrateStart().then((router) => {
+    hydrate(() => <StartClient router={router} />, document)
+  })
+}
diff --git a/packages/solid-start-client/src/index.tsx b/packages/solid-start-client/src/index.tsx
index bb2953e2e35..055c145911d 100644
--- a/packages/solid-start-client/src/index.tsx
+++ b/packages/solid-start-client/src/index.tsx
@@ -1,2 +1 @@
-export { StartClient } from './StartClient'
-export { hydrateStart } from '@tanstack/start-client-core/client'
+export { StartClient, clientHydrate } from './StartClient'
diff --git a/packages/solid-start/src/default-entry/client.tsx b/packages/solid-start/src/default-entry/client.tsx
index 8e8dc89b9d1..345b74779eb 100644
--- a/packages/solid-start/src/default-entry/client.tsx
+++ b/packages/solid-start/src/default-entry/client.tsx
@@ -1,7 +1,3 @@
-import { hydrate } from 'solid-js/web'
-import { hydrateStart } from '@tanstack/start-client-core/client'
-import { StartClient } from '@tanstack/solid-start/client'
+import { clientHydrate } from '@tanstack/solid-start-client'
 
-hydrateStart().then((router) => {
-  hydrate(() => <StartClient router={router} />, document)
-})
+clientHydrate()