From fde43c41d037e4fa46c90c05cd9b1b3ac31b6040 Mon Sep 17 00:00:00 2001
From: Grayash <k_2684@naver.com>
Date: Tue, 11 Aug 2026 16:18:46 +0900
Subject: [PATCH] fix(react-router): honor preventScriptHoist during hydration

---
 packages/react-router/src/Asset.tsx          | 12 ++-
 packages/react-router/tests/Scripts.test.tsx | 77 ++++++++++++++++++++
 2 files changed, 88 insertions(+), 1 deletion(-)

diff --git a/packages/react-router/src/Asset.tsx b/packages/react-router/src/Asset.tsx
index 5e4f159f526..7f6297732ba 100644
--- a/packages/react-router/src/Asset.tsx
+++ b/packages/react-router/src/Asset.tsx
@@ -270,7 +270,17 @@ function Script({
   // After hydration, return null — the useEffect handles imperative injection.
   if (!hydrated) {
     if (attrs?.src) {
-      return <script {...attrs} suppressHydrationWarning />
+      if (!preventScriptHoist) {
+        return <script {...attrs} suppressHydrationWarning />
+      }
+
+      return (
+        <script
+          {...attrs}
+          onLoad={noopScriptHandler}
+          suppressHydrationWarning
+        />
+      )
     }
 
     if (typeof children === 'string') {
diff --git a/packages/react-router/tests/Scripts.test.tsx b/packages/react-router/tests/Scripts.test.tsx
index 893cef01bc8..e5c9dbbaccc 100644
--- a/packages/react-router/tests/Scripts.test.tsx
+++ b/packages/react-router/tests/Scripts.test.tsx
@@ -8,6 +8,7 @@ import {
   waitFor,
 } from '@testing-library/react'
 import { createPortal } from 'react-dom'
+import { hydrateRoot } from 'react-dom/client'
 import ReactDOMServer from 'react-dom/server'
 import { hydrate } from '@tanstack/router-core/ssr/client'
 import { dehydrateSsrMatchId } from '../../router-core/src/ssr/ssr-match-id'
@@ -281,6 +282,82 @@ describe('scripts with async/defer attributes', () => {
     expect(html).not.toContain('client-entry')
   })
 
+  test('hydration honors preventScriptHoist for manifest src scripts', async () => {
+    const clientEntryAsset = {
+      attrs: {
+        src: '/hydrate-entry.js',
+        type: 'module',
+        async: true,
+      },
+    } satisfies NonNullable<Manifest['routes'][string]['scripts']>[number]
+
+    const createTestRouter = (isServer: boolean) => {
+      const rootRoute = createRootRoute({
+        component: () => {
+          return (
+            <div>
+              <main data-testid="hydrate-content">content</main>
+              <Outlet />
+              <Scripts />
+            </div>
+          )
+        },
+      })
+
+      const indexRoute = createRoute({
+        path: '/',
+        getParentRoute: () => rootRoute,
+      })
+
+      const router = createRouter({
+        history: createMemoryHistory({
+          initialEntries: ['/'],
+        }),
+        routeTree: rootRoute.addChildren([indexRoute]),
+        isServer,
+      })
+      router.ssr = {
+        manifest: {
+          routes: {
+            [rootRoute.id]: {
+              scripts: [clientEntryAsset],
+            },
+          },
+        },
+      }
+      return router
+    }
+
+    const serverRouter = createTestRouter(true)
+    await serverRouter.load()
+
+    const html = ReactDOMServer.renderToString(
+      <RouterProvider router={serverRouter} />,
+    )
+    expect(html).toContain('src="/hydrate-entry.js"')
+
+    const container = document.createElement('div')
+    container.innerHTML = html
+    document.body.appendChild(container)
+
+    const clientRouter = createTestRouter(false)
+    await clientRouter.load()
+
+    const onRecoverableError = vi.fn()
+    let root: ReturnType<typeof hydrateRoot> | undefined
+    await act(() => {
+      root = hydrateRoot(container, <RouterProvider router={clientRouter} />, {
+        onRecoverableError,
+      })
+    })
+
+    expect(await screen.findByTestId('hydrate-content')).toBeInTheDocument()
+    expect(onRecoverableError).not.toHaveBeenCalled()
+
+    await act(() => root?.unmount())
+    container.remove()
+  })
+
   test('client renders scripts with attributes (including async/defer)', async () => {
     const rootRoute = createRootRoute({
       scripts: () => [