From 027676c3b7100469ef983e550c71856af07e3ac2 Mon Sep 17 00:00:00 2001
From: wookhyung <qpflapffhs76@gmail.com>
Date: Sat, 6 Sep 2025 18:08:17 +0900
Subject: [PATCH 1/9] fix(router): prevent script tag duplication in SSR and
 client-side navigation

---
 e2e/react-start/basic/src/routeTree.gen.ts    |  45 ++++++
 e2e/react-start/basic/src/routes/__root.tsx   |   8 +
 .../basic/src/routes/inline-scripts.tsx       |  25 +++
 .../basic/tests/navigation.spec.ts            |   2 +-
 .../basic/tests/script-duplication.spec.ts    | 150 ++++++++++++++++++
 e2e/solid-start/basic/src/routeTree.gen.ts    |  21 +++
 e2e/solid-start/basic/src/routes/__root.tsx   |   8 +
 .../basic/src/routes/inline-scripts.tsx       |  27 ++++
 .../basic/tests/navigation.spec.ts            |   2 +-
 .../basic/tests/script-duplication.spec.ts    | 150 ++++++++++++++++++
 packages/react-router/src/Asset.tsx           |  18 +++
 packages/solid-router/src/Asset.tsx           |  18 +++
 12 files changed, 472 insertions(+), 2 deletions(-)
 create mode 100644 e2e/react-start/basic/src/routes/inline-scripts.tsx
 create mode 100644 e2e/react-start/basic/tests/script-duplication.spec.ts
 create mode 100644 e2e/solid-start/basic/src/routes/inline-scripts.tsx
 create mode 100644 e2e/solid-start/basic/tests/script-duplication.spec.ts

diff --git a/e2e/react-start/basic/src/routeTree.gen.ts b/e2e/react-start/basic/src/routeTree.gen.ts
index b6fc9282f67..1298d9b2113 100644
--- a/e2e/react-start/basic/src/routeTree.gen.ts
+++ b/e2e/react-start/basic/src/routeTree.gen.ts
@@ -23,6 +23,7 @@ import { Route as StreamRouteImport } from './routes/stream'
 import { Route as ScriptsRouteImport } from './routes/scripts'
 import { Route as PostsRouteImport } from './routes/posts'
 import { Route as LinksRouteImport } from './routes/links'
+import { Route as InlineScriptsRouteImport } from './routes/inline-scripts'
 import { Route as DeferredRouteImport } from './routes/deferred'
 import { Route as LayoutRouteImport } from './routes/_layout'
 import { Route as SearchParamsRouteRouteImport } from './routes/search-params/route'
@@ -90,6 +91,11 @@ const LinksRoute = LinksRouteImport.update({
   path: '/links',
   getParentRoute: () => rootRouteImport,
 } as any)
+const InlineScriptsRoute = InlineScriptsRouteImport.update({
+  id: '/inline-scripts',
+  path: '/inline-scripts',
+  getParentRoute: () => rootRouteImport,
+} as any)
 const DeferredRoute = DeferredRouteImport.update({
   id: '/deferred',
   path: '/deferred',
@@ -264,6 +270,7 @@ export interface FileRoutesByFullPath {
   '/not-found': typeof NotFoundRouteRouteWithChildren
   '/search-params': typeof SearchParamsRouteRouteWithChildren
   '/deferred': typeof DeferredRoute
+  '/inline-scripts': typeof InlineScriptsRoute
   '/links': typeof LinksRoute
   '/posts': typeof PostsRouteWithChildren
   '/scripts': typeof ScriptsRoute
@@ -298,6 +305,7 @@ export interface FileRoutesByFullPath {
 export interface FileRoutesByTo {
   '/': typeof IndexRoute
   '/deferred': typeof DeferredRoute
+  '/inline-scripts': typeof InlineScriptsRoute
   '/links': typeof LinksRoute
   '/scripts': typeof ScriptsRoute
   '/stream': typeof StreamRoute
@@ -332,6 +340,7 @@ export interface FileRoutesById {
   '/search-params': typeof SearchParamsRouteRouteWithChildren
   '/_layout': typeof LayoutRouteWithChildren
   '/deferred': typeof DeferredRoute
+  '/inline-scripts': typeof InlineScriptsRoute
   '/links': typeof LinksRoute
   '/posts': typeof PostsRouteWithChildren
   '/scripts': typeof ScriptsRoute
@@ -372,6 +381,7 @@ export interface FileRouteTypes {
     | '/not-found'
     | '/search-params'
     | '/deferred'
+    | '/inline-scripts'
     | '/links'
     | '/posts'
     | '/scripts'
@@ -406,6 +416,7 @@ export interface FileRouteTypes {
   to:
     | '/'
     | '/deferred'
+    | '/inline-scripts'
     | '/links'
     | '/scripts'
     | '/stream'
@@ -439,6 +450,7 @@ export interface FileRouteTypes {
     | '/search-params'
     | '/_layout'
     | '/deferred'
+    | '/inline-scripts'
     | '/links'
     | '/posts'
     | '/scripts'
@@ -479,6 +491,7 @@ export interface RootRouteChildren {
   SearchParamsRouteRoute: typeof SearchParamsRouteRouteWithChildren
   LayoutRoute: typeof LayoutRouteWithChildren
   DeferredRoute: typeof DeferredRoute
+  InlineScriptsRoute: typeof InlineScriptsRoute
   LinksRoute: typeof LinksRoute
   PostsRoute: typeof PostsRouteWithChildren
   ScriptsRoute: typeof ScriptsRoute
@@ -552,6 +565,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof DeferredRouteImport
       parentRoute: typeof rootRouteImport
     }
+    '/inline-scripts': {
+      id: '/inline-scripts'
+      path: '/inline-scripts'
+      fullPath: '/inline-scripts'
+      preLoaderRoute: typeof InlineScriptsRouteImport
+      parentRoute: typeof rootRouteImport
+    }
     '/links': {
       id: '/links'
       path: '/links'
@@ -829,6 +849,13 @@ declare module '@tanstack/react-start/server' {
       preLoaderRoute: unknown
       parentRoute: typeof rootServerRouteImport
     }
+    '/inline-scripts': {
+      id: '/inline-scripts'
+      path: '/inline-scripts'
+      fullPath: '/inline-scripts'
+      preLoaderRoute: unknown
+      parentRoute: typeof rootServerRouteImport
+    }
     '/links': {
       id: '/links'
       path: '/links'
@@ -1148,6 +1175,23 @@ declare module './routes/deferred' {
     unknown
   >
 }
+declare module './routes/inline-scripts' {
+  const createFileRoute: CreateFileRoute<
+    '/inline-scripts',
+    FileRoutesByPath['/inline-scripts']['parentRoute'],
+    FileRoutesByPath['/inline-scripts']['id'],
+    FileRoutesByPath['/inline-scripts']['path'],
+    FileRoutesByPath['/inline-scripts']['fullPath']
+  >
+
+  const createServerFileRoute: CreateServerFileRoute<
+    ServerFileRoutesByPath['/inline-scripts']['parentRoute'],
+    ServerFileRoutesByPath['/inline-scripts']['id'],
+    ServerFileRoutesByPath['/inline-scripts']['path'],
+    ServerFileRoutesByPath['/inline-scripts']['fullPath'],
+    unknown
+  >
+}
 declare module './routes/links' {
   const createFileRoute: CreateFileRoute<
     '/links',
@@ -1858,6 +1902,7 @@ const rootRouteChildren: RootRouteChildren = {
   SearchParamsRouteRoute: SearchParamsRouteRouteWithChildren,
   LayoutRoute: LayoutRouteWithChildren,
   DeferredRoute: DeferredRoute,
+  InlineScriptsRoute: InlineScriptsRoute,
   LinksRoute: LinksRoute,
   PostsRoute: PostsRouteWithChildren,
   ScriptsRoute: ScriptsRoute,
diff --git a/e2e/react-start/basic/src/routes/__root.tsx b/e2e/react-start/basic/src/routes/__root.tsx
index 3283cb8a1ae..9c3a7138b0e 100644
--- a/e2e/react-start/basic/src/routes/__root.tsx
+++ b/e2e/react-start/basic/src/routes/__root.tsx
@@ -141,6 +141,14 @@ function RootDocument({ children }: { children: React.ReactNode }) {
           >
             Scripts
           </Link>{' '}
+          <Link
+            to="/inline-scripts"
+            activeProps={{
+              className: 'font-bold',
+            }}
+          >
+            Inline Scripts
+          </Link>{' '}
           <Link
             to="/deferred"
             activeProps={{
diff --git a/e2e/react-start/basic/src/routes/inline-scripts.tsx b/e2e/react-start/basic/src/routes/inline-scripts.tsx
new file mode 100644
index 00000000000..41850487d29
--- /dev/null
+++ b/e2e/react-start/basic/src/routes/inline-scripts.tsx
@@ -0,0 +1,25 @@
+export const Route = createFileRoute({
+  head: () => ({
+    scripts: [
+      {
+        children: 'window.INLINE_SCRIPT_1 = true; console.log("Inline script 1 executed");'
+      },
+      {
+        children: 'window.INLINE_SCRIPT_2 = "test"; console.log("Inline script 2 executed");',
+        type: 'text/javascript'
+      }
+    ],
+  }),
+  component: InlineScriptsComponent,
+})
+
+function InlineScriptsComponent() {
+  return (
+    <div className="p-2">
+      <h3 data-testid="inline-scripts-test-heading">Inline Scripts Test</h3>
+      <p>
+        This route tests inline script duplication prevention. Two inline scripts should be loaded.
+      </p>
+    </div>
+  )
+}
\ No newline at end of file
diff --git a/e2e/react-start/basic/tests/navigation.spec.ts b/e2e/react-start/basic/tests/navigation.spec.ts
index 5d21f2adbe1..62433a0134d 100644
--- a/e2e/react-start/basic/tests/navigation.spec.ts
+++ b/e2e/react-start/basic/tests/navigation.spec.ts
@@ -34,7 +34,7 @@ test('Navigating nested layouts', async ({ page }) => {
 
 test('client side navigating to a route with scripts', async ({ page }) => {
   await page.goto('/')
-  await page.getByRole('link', { name: 'Scripts' }).click()
+  await page.getByRole('link', { name: 'Scripts', exact: true }).click()
   await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
   expect(await page.evaluate('window.SCRIPT_1')).toBe(true)
   expect(await page.evaluate('window.SCRIPT_2')).toBe(undefined)
diff --git a/e2e/react-start/basic/tests/script-duplication.spec.ts b/e2e/react-start/basic/tests/script-duplication.spec.ts
new file mode 100644
index 00000000000..a60d49fb325
--- /dev/null
+++ b/e2e/react-start/basic/tests/script-duplication.spec.ts
@@ -0,0 +1,150 @@
+import { expect, test } from '@playwright/test'
+
+test.describe('Script Duplication Prevention', () => {
+  test('should not create duplicate scripts on SSR route', async ({ page }) => {
+    // Navigate directly to scripts route (SSR scenario)
+    await page.goto('/scripts')
+    
+    await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
+    
+    // Count script tags with src="script.js"
+    const scriptCount = await page.evaluate(() => {
+      return document.querySelectorAll('script[src="script.js"]').length
+    })
+    
+    // Should have exactly one script tag
+    expect(scriptCount).toBe(1)
+    
+    // Verify the script executed correctly
+    expect(await page.evaluate('window.SCRIPT_1')).toBe(true)
+  })
+
+  test('should not create duplicate scripts during client-side navigation', async ({ page }) => {
+    // Start from home page
+    await page.goto('/')
+    
+    // Navigate to scripts route (client-side navigation)
+    await page.getByRole('link', { name: 'Scripts', exact: true }).click()
+    await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
+    
+    // Count script tags after first navigation
+    const firstNavCount = await page.evaluate(() => {
+      return document.querySelectorAll('script[src="script.js"]').length
+    })
+    expect(firstNavCount).toBe(1)
+    
+    // Navigate away from scripts route
+    await page.getByRole('link', { name: 'Home' }).click()
+    await expect(page.getByRole('link', { name: 'Posts' })).toBeVisible()
+    
+    // Navigate back to scripts route
+    await page.getByRole('link', { name: 'Scripts', exact: true }).click()
+    await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
+    
+    // Count script tags after second navigation - should still be 1
+    const secondNavCount = await page.evaluate(() => {
+      return document.querySelectorAll('script[src="script.js"]').length
+    })
+    expect(secondNavCount).toBe(1)
+    
+    // Verify the script is still working
+    expect(await page.evaluate('window.SCRIPT_1')).toBe(true)
+  })
+
+  test('should not create duplicate scripts with multiple navigation cycles', async ({ page }) => {
+    // Start from home page
+    await page.goto('/')
+    
+    // Navigate to scripts route multiple times
+    for (let i = 0; i < 3; i++) {
+      // Go to scripts
+      await page.getByRole('link', { name: 'Scripts', exact: true }).click()
+      await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
+      
+      // Go back to home
+      await page.getByRole('link', { name: 'Home' }).click()
+      await expect(page.getByRole('link', { name: 'Posts' })).toBeVisible()
+    }
+    
+    // Final navigation to scripts
+    await page.getByRole('link', { name: 'Scripts', exact: true }).click()
+    await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
+    
+    // Count script tags - should still be exactly 1
+    const finalCount = await page.evaluate(() => {
+      return document.querySelectorAll('script[src="script.js"]').length
+    })
+    expect(finalCount).toBe(1)
+    
+    // Verify the script is still working
+    expect(await page.evaluate('window.SCRIPT_1')).toBe(true)
+  })
+
+  test('should not create duplicate inline scripts', async ({ page }) => {
+    // Navigate directly to inline scripts route (SSR scenario)
+    await page.goto('/inline-scripts')
+    
+    await expect(page.getByTestId('inline-scripts-test-heading')).toBeInViewport()
+    
+    // Count specific inline scripts
+    const script1Count = await page.evaluate(() => {
+      const scripts = Array.from(document.querySelectorAll('script:not([src])'))
+      return scripts.filter(script => 
+        script.textContent && script.textContent.includes('window.INLINE_SCRIPT_1 = true')
+      ).length
+    })
+    
+    const script2Count = await page.evaluate(() => {
+      const scripts = Array.from(document.querySelectorAll('script:not([src])'))
+      return scripts.filter(script => 
+        script.textContent && script.textContent.includes('window.INLINE_SCRIPT_2 = "test"')
+      ).length
+    })
+    
+    // Should have exactly one of each inline script
+    expect(script1Count).toBe(1)
+    expect(script2Count).toBe(1)
+    
+    // Verify the scripts executed correctly
+    expect(await page.evaluate('window.INLINE_SCRIPT_1')).toBe(true)
+    expect(await page.evaluate('window.INLINE_SCRIPT_2')).toBe('test')
+  })
+
+  test('should not create duplicate inline scripts during client-side navigation', async ({ page }) => {
+    // Start from home page
+    await page.goto('/')
+    
+    // Navigate to inline scripts route (client-side navigation)
+    await page.getByRole('link', { name: 'Inline Scripts' }).click()
+    await expect(page.getByTestId('inline-scripts-test-heading')).toBeInViewport()
+    
+    // Count inline scripts after first navigation
+    const firstNavScript1Count = await page.evaluate(() => {
+      const scripts = Array.from(document.querySelectorAll('script:not([src])'))
+      return scripts.filter(script => 
+        script.textContent && script.textContent.includes('window.INLINE_SCRIPT_1 = true')
+      ).length
+    })
+    expect(firstNavScript1Count).toBe(1)
+    
+    // Navigate away and back
+    await page.getByRole('link', { name: 'Home' }).click()
+    await expect(page.getByRole('link', { name: 'Posts' })).toBeVisible()
+    
+    await page.getByRole('link', { name: 'Inline Scripts' }).click()
+    await expect(page.getByTestId('inline-scripts-test-heading')).toBeInViewport()
+    
+    // Count inline scripts after second navigation - should still be 1
+    const secondNavScript1Count = await page.evaluate(() => {
+      const scripts = Array.from(document.querySelectorAll('script:not([src])'))
+      return scripts.filter(script => 
+        script.textContent && script.textContent.includes('window.INLINE_SCRIPT_1 = true')
+      ).length
+    })
+    expect(secondNavScript1Count).toBe(1)
+    
+    // Verify the scripts are still working
+    expect(await page.evaluate('window.INLINE_SCRIPT_1')).toBe(true)
+    expect(await page.evaluate('window.INLINE_SCRIPT_2')).toBe('test')
+  })
+})
\ No newline at end of file
diff --git a/e2e/solid-start/basic/src/routeTree.gen.ts b/e2e/solid-start/basic/src/routeTree.gen.ts
index 307552541dc..cf6db920d4e 100644
--- a/e2e/solid-start/basic/src/routeTree.gen.ts
+++ b/e2e/solid-start/basic/src/routeTree.gen.ts
@@ -16,6 +16,7 @@ import { Route as StreamRouteImport } from './routes/stream'
 import { Route as ScriptsRouteImport } from './routes/scripts'
 import { Route as PostsRouteImport } from './routes/posts'
 import { Route as LinksRouteImport } from './routes/links'
+import { Route as InlineScriptsRouteImport } from './routes/inline-scripts'
 import { Route as DeferredRouteImport } from './routes/deferred'
 import { Route as LayoutRouteImport } from './routes/_layout'
 import { Route as SearchParamsRouteRouteImport } from './routes/search-params/route'
@@ -74,6 +75,11 @@ const LinksRoute = LinksRouteImport.update({
   path: '/links',
   getParentRoute: () => rootRouteImport,
 } as any)
+const InlineScriptsRoute = InlineScriptsRouteImport.update({
+  id: '/inline-scripts',
+  path: '/inline-scripts',
+  getParentRoute: () => rootRouteImport,
+} as any)
 const DeferredRoute = DeferredRouteImport.update({
   id: '/deferred',
   path: '/deferred',
@@ -234,6 +240,7 @@ export interface FileRoutesByFullPath {
   '/not-found': typeof NotFoundRouteRouteWithChildren
   '/search-params': typeof SearchParamsRouteRouteWithChildren
   '/deferred': typeof DeferredRoute
+  '/inline-scripts': typeof InlineScriptsRoute
   '/links': typeof LinksRoute
   '/posts': typeof PostsRouteWithChildren
   '/scripts': typeof ScriptsRoute
@@ -265,6 +272,7 @@ export interface FileRoutesByFullPath {
 export interface FileRoutesByTo {
   '/': typeof IndexRoute
   '/deferred': typeof DeferredRoute
+  '/inline-scripts': typeof InlineScriptsRoute
   '/links': typeof LinksRoute
   '/scripts': typeof ScriptsRoute
   '/stream': typeof StreamRoute
@@ -297,6 +305,7 @@ export interface FileRoutesById {
   '/search-params': typeof SearchParamsRouteRouteWithChildren
   '/_layout': typeof LayoutRouteWithChildren
   '/deferred': typeof DeferredRoute
+  '/inline-scripts': typeof InlineScriptsRoute
   '/links': typeof LinksRoute
   '/posts': typeof PostsRouteWithChildren
   '/scripts': typeof ScriptsRoute
@@ -333,6 +342,7 @@ export interface FileRouteTypes {
     | '/not-found'
     | '/search-params'
     | '/deferred'
+    | '/inline-scripts'
     | '/links'
     | '/posts'
     | '/scripts'
@@ -364,6 +374,7 @@ export interface FileRouteTypes {
   to:
     | '/'
     | '/deferred'
+    | '/inline-scripts'
     | '/links'
     | '/scripts'
     | '/stream'
@@ -395,6 +406,7 @@ export interface FileRouteTypes {
     | '/search-params'
     | '/_layout'
     | '/deferred'
+    | '/inline-scripts'
     | '/links'
     | '/posts'
     | '/scripts'
@@ -431,6 +443,7 @@ export interface RootRouteChildren {
   SearchParamsRouteRoute: typeof SearchParamsRouteRouteWithChildren
   LayoutRoute: typeof LayoutRouteWithChildren
   DeferredRoute: typeof DeferredRoute
+  InlineScriptsRoute: typeof InlineScriptsRoute
   LinksRoute: typeof LinksRoute
   PostsRoute: typeof PostsRouteWithChildren
   ScriptsRoute: typeof ScriptsRoute
@@ -502,6 +515,13 @@ declare module '@tanstack/solid-router' {
       preLoaderRoute: typeof LinksRouteImport
       parentRoute: typeof rootRouteImport
     }
+    '/inline-scripts': {
+      id: '/inline-scripts'
+      path: '/inline-scripts'
+      fullPath: '/inline-scripts'
+      preLoaderRoute: typeof InlineScriptsRouteImport
+      parentRoute: typeof rootRouteImport
+    }
     '/deferred': {
       id: '/deferred'
       path: '/deferred'
@@ -843,6 +863,7 @@ const rootRouteChildren: RootRouteChildren = {
   SearchParamsRouteRoute: SearchParamsRouteRouteWithChildren,
   LayoutRoute: LayoutRouteWithChildren,
   DeferredRoute: DeferredRoute,
+  InlineScriptsRoute: InlineScriptsRoute,
   LinksRoute: LinksRoute,
   PostsRoute: PostsRouteWithChildren,
   ScriptsRoute: ScriptsRoute,
diff --git a/e2e/solid-start/basic/src/routes/__root.tsx b/e2e/solid-start/basic/src/routes/__root.tsx
index 6598d8b3164..fe2dc996f04 100644
--- a/e2e/solid-start/basic/src/routes/__root.tsx
+++ b/e2e/solid-start/basic/src/routes/__root.tsx
@@ -103,6 +103,14 @@ function RootComponent() {
         >
           Scripts
         </Link>{' '}
+        <Link
+          to="/inline-scripts"
+          activeProps={{
+            class: 'font-bold',
+          }}
+        >
+          Inline Scripts
+        </Link>{' '}
         <Link
           to="/deferred"
           activeProps={{
diff --git a/e2e/solid-start/basic/src/routes/inline-scripts.tsx b/e2e/solid-start/basic/src/routes/inline-scripts.tsx
new file mode 100644
index 00000000000..31cf5b9ab6e
--- /dev/null
+++ b/e2e/solid-start/basic/src/routes/inline-scripts.tsx
@@ -0,0 +1,27 @@
+import { createFileRoute } from '@tanstack/solid-router'
+
+export const Route = createFileRoute('/inline-scripts')({
+  head: () => ({
+    scripts: [
+      {
+        children: 'window.INLINE_SCRIPT_1 = true; console.log("Inline script 1 executed");'
+      },
+      {
+        children: 'window.INLINE_SCRIPT_2 = "test"; console.log("Inline script 2 executed");',
+        type: 'text/javascript'
+      }
+    ],
+  }),
+  component: InlineScriptsComponent,
+})
+
+function InlineScriptsComponent() {
+  return (
+    <div class="p-2">
+      <h3 data-testid="inline-scripts-test-heading">Inline Scripts Test</h3>
+      <p>
+        This route tests inline script duplication prevention. Two inline scripts should be loaded.
+      </p>
+    </div>
+  )
+}
\ No newline at end of file
diff --git a/e2e/solid-start/basic/tests/navigation.spec.ts b/e2e/solid-start/basic/tests/navigation.spec.ts
index 5d21f2adbe1..62433a0134d 100644
--- a/e2e/solid-start/basic/tests/navigation.spec.ts
+++ b/e2e/solid-start/basic/tests/navigation.spec.ts
@@ -34,7 +34,7 @@ test('Navigating nested layouts', async ({ page }) => {
 
 test('client side navigating to a route with scripts', async ({ page }) => {
   await page.goto('/')
-  await page.getByRole('link', { name: 'Scripts' }).click()
+  await page.getByRole('link', { name: 'Scripts', exact: true }).click()
   await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
   expect(await page.evaluate('window.SCRIPT_1')).toBe(true)
   expect(await page.evaluate('window.SCRIPT_2')).toBe(undefined)
diff --git a/e2e/solid-start/basic/tests/script-duplication.spec.ts b/e2e/solid-start/basic/tests/script-duplication.spec.ts
new file mode 100644
index 00000000000..a60d49fb325
--- /dev/null
+++ b/e2e/solid-start/basic/tests/script-duplication.spec.ts
@@ -0,0 +1,150 @@
+import { expect, test } from '@playwright/test'
+
+test.describe('Script Duplication Prevention', () => {
+  test('should not create duplicate scripts on SSR route', async ({ page }) => {
+    // Navigate directly to scripts route (SSR scenario)
+    await page.goto('/scripts')
+    
+    await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
+    
+    // Count script tags with src="script.js"
+    const scriptCount = await page.evaluate(() => {
+      return document.querySelectorAll('script[src="script.js"]').length
+    })
+    
+    // Should have exactly one script tag
+    expect(scriptCount).toBe(1)
+    
+    // Verify the script executed correctly
+    expect(await page.evaluate('window.SCRIPT_1')).toBe(true)
+  })
+
+  test('should not create duplicate scripts during client-side navigation', async ({ page }) => {
+    // Start from home page
+    await page.goto('/')
+    
+    // Navigate to scripts route (client-side navigation)
+    await page.getByRole('link', { name: 'Scripts', exact: true }).click()
+    await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
+    
+    // Count script tags after first navigation
+    const firstNavCount = await page.evaluate(() => {
+      return document.querySelectorAll('script[src="script.js"]').length
+    })
+    expect(firstNavCount).toBe(1)
+    
+    // Navigate away from scripts route
+    await page.getByRole('link', { name: 'Home' }).click()
+    await expect(page.getByRole('link', { name: 'Posts' })).toBeVisible()
+    
+    // Navigate back to scripts route
+    await page.getByRole('link', { name: 'Scripts', exact: true }).click()
+    await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
+    
+    // Count script tags after second navigation - should still be 1
+    const secondNavCount = await page.evaluate(() => {
+      return document.querySelectorAll('script[src="script.js"]').length
+    })
+    expect(secondNavCount).toBe(1)
+    
+    // Verify the script is still working
+    expect(await page.evaluate('window.SCRIPT_1')).toBe(true)
+  })
+
+  test('should not create duplicate scripts with multiple navigation cycles', async ({ page }) => {
+    // Start from home page
+    await page.goto('/')
+    
+    // Navigate to scripts route multiple times
+    for (let i = 0; i < 3; i++) {
+      // Go to scripts
+      await page.getByRole('link', { name: 'Scripts', exact: true }).click()
+      await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
+      
+      // Go back to home
+      await page.getByRole('link', { name: 'Home' }).click()
+      await expect(page.getByRole('link', { name: 'Posts' })).toBeVisible()
+    }
+    
+    // Final navigation to scripts
+    await page.getByRole('link', { name: 'Scripts', exact: true }).click()
+    await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
+    
+    // Count script tags - should still be exactly 1
+    const finalCount = await page.evaluate(() => {
+      return document.querySelectorAll('script[src="script.js"]').length
+    })
+    expect(finalCount).toBe(1)
+    
+    // Verify the script is still working
+    expect(await page.evaluate('window.SCRIPT_1')).toBe(true)
+  })
+
+  test('should not create duplicate inline scripts', async ({ page }) => {
+    // Navigate directly to inline scripts route (SSR scenario)
+    await page.goto('/inline-scripts')
+    
+    await expect(page.getByTestId('inline-scripts-test-heading')).toBeInViewport()
+    
+    // Count specific inline scripts
+    const script1Count = await page.evaluate(() => {
+      const scripts = Array.from(document.querySelectorAll('script:not([src])'))
+      return scripts.filter(script => 
+        script.textContent && script.textContent.includes('window.INLINE_SCRIPT_1 = true')
+      ).length
+    })
+    
+    const script2Count = await page.evaluate(() => {
+      const scripts = Array.from(document.querySelectorAll('script:not([src])'))
+      return scripts.filter(script => 
+        script.textContent && script.textContent.includes('window.INLINE_SCRIPT_2 = "test"')
+      ).length
+    })
+    
+    // Should have exactly one of each inline script
+    expect(script1Count).toBe(1)
+    expect(script2Count).toBe(1)
+    
+    // Verify the scripts executed correctly
+    expect(await page.evaluate('window.INLINE_SCRIPT_1')).toBe(true)
+    expect(await page.evaluate('window.INLINE_SCRIPT_2')).toBe('test')
+  })
+
+  test('should not create duplicate inline scripts during client-side navigation', async ({ page }) => {
+    // Start from home page
+    await page.goto('/')
+    
+    // Navigate to inline scripts route (client-side navigation)
+    await page.getByRole('link', { name: 'Inline Scripts' }).click()
+    await expect(page.getByTestId('inline-scripts-test-heading')).toBeInViewport()
+    
+    // Count inline scripts after first navigation
+    const firstNavScript1Count = await page.evaluate(() => {
+      const scripts = Array.from(document.querySelectorAll('script:not([src])'))
+      return scripts.filter(script => 
+        script.textContent && script.textContent.includes('window.INLINE_SCRIPT_1 = true')
+      ).length
+    })
+    expect(firstNavScript1Count).toBe(1)
+    
+    // Navigate away and back
+    await page.getByRole('link', { name: 'Home' }).click()
+    await expect(page.getByRole('link', { name: 'Posts' })).toBeVisible()
+    
+    await page.getByRole('link', { name: 'Inline Scripts' }).click()
+    await expect(page.getByTestId('inline-scripts-test-heading')).toBeInViewport()
+    
+    // Count inline scripts after second navigation - should still be 1
+    const secondNavScript1Count = await page.evaluate(() => {
+      const scripts = Array.from(document.querySelectorAll('script:not([src])'))
+      return scripts.filter(script => 
+        script.textContent && script.textContent.includes('window.INLINE_SCRIPT_1 = true')
+      ).length
+    })
+    expect(secondNavScript1Count).toBe(1)
+    
+    // Verify the scripts are still working
+    expect(await page.evaluate('window.INLINE_SCRIPT_1')).toBe(true)
+    expect(await page.evaluate('window.INLINE_SCRIPT_2')).toBe('test')
+  })
+})
\ No newline at end of file
diff --git a/packages/react-router/src/Asset.tsx b/packages/react-router/src/Asset.tsx
index 218663e24f2..a555f259ede 100644
--- a/packages/react-router/src/Asset.tsx
+++ b/packages/react-router/src/Asset.tsx
@@ -46,6 +46,13 @@ function Script({
 }) {
   React.useEffect(() => {
     if (attrs?.src) {
+      const existingScript = document.querySelector(
+        `script[src="${attrs.src}"]`,
+      )
+      if (existingScript) {
+        return
+      }
+
       const script = document.createElement('script')
 
       for (const [key, value] of Object.entries(attrs)) {
@@ -71,6 +78,13 @@ function Script({
     }
 
     if (typeof children === 'string') {
+      const existingScript = Array.from(
+        document.querySelectorAll('script:not([src])'),
+      ).find((script) => script.textContent === children)
+      if (existingScript) {
+        return
+      }
+
       const script = document.createElement('script')
       script.textContent = children
 
@@ -101,6 +115,10 @@ function Script({
     return undefined
   }, [attrs, children])
 
+  if (typeof window !== 'undefined') {
+    return null
+  }
+
   if (attrs?.src && typeof attrs.src === 'string') {
     return <script {...attrs} suppressHydrationWarning />
   }
diff --git a/packages/solid-router/src/Asset.tsx b/packages/solid-router/src/Asset.tsx
index 62e1b8468e9..f866012b515 100644
--- a/packages/solid-router/src/Asset.tsx
+++ b/packages/solid-router/src/Asset.tsx
@@ -38,6 +38,13 @@ function Script({
 }): JSX.Element | null {
   onMount(() => {
     if (attrs?.src) {
+      const existingScript = document.querySelector(
+        `script[src="${attrs.src}"]`,
+      )
+      if (existingScript) {
+        return
+      }
+
       const script = document.createElement('script')
 
       for (const [key, value] of Object.entries(attrs)) {
@@ -57,6 +64,13 @@ function Script({
         }
       })
     } else if (typeof children === 'string') {
+      const existingScript = Array.from(
+        document.querySelectorAll('script:not([src])'),
+      ).find((script) => script.textContent === children)
+      if (existingScript) {
+        return
+      }
+
       const script = document.createElement('script')
       script.textContent = children
 
@@ -81,6 +95,10 @@ function Script({
     }
   })
 
+  if (typeof window !== 'undefined') {
+    return null
+  }
+
   if (attrs?.src && typeof attrs.src === 'string') {
     return <script {...attrs} />
   }

From 3d0075355b490fe08ad6de5aff2769753f994d5a Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Sat, 6 Sep 2025 09:23:01 +0000
Subject: [PATCH 2/9] ci: apply automated fixes

---
 .../basic/src/routes/inline-scripts.tsx       |  15 +--
 .../basic/tests/script-duplication.spec.ts    | 102 +++++++++++-------
 .../basic/src/routes/inline-scripts.tsx       |  15 +--
 .../basic/tests/script-duplication.spec.ts    | 102 +++++++++++-------
 4 files changed, 140 insertions(+), 94 deletions(-)

diff --git a/e2e/react-start/basic/src/routes/inline-scripts.tsx b/e2e/react-start/basic/src/routes/inline-scripts.tsx
index 41850487d29..282cb93804c 100644
--- a/e2e/react-start/basic/src/routes/inline-scripts.tsx
+++ b/e2e/react-start/basic/src/routes/inline-scripts.tsx
@@ -2,12 +2,14 @@ export const Route = createFileRoute({
   head: () => ({
     scripts: [
       {
-        children: 'window.INLINE_SCRIPT_1 = true; console.log("Inline script 1 executed");'
+        children:
+          'window.INLINE_SCRIPT_1 = true; console.log("Inline script 1 executed");',
       },
       {
-        children: 'window.INLINE_SCRIPT_2 = "test"; console.log("Inline script 2 executed");',
-        type: 'text/javascript'
-      }
+        children:
+          'window.INLINE_SCRIPT_2 = "test"; console.log("Inline script 2 executed");',
+        type: 'text/javascript',
+      },
     ],
   }),
   component: InlineScriptsComponent,
@@ -18,8 +20,9 @@ function InlineScriptsComponent() {
     <div className="p-2">
       <h3 data-testid="inline-scripts-test-heading">Inline Scripts Test</h3>
       <p>
-        This route tests inline script duplication prevention. Two inline scripts should be loaded.
+        This route tests inline script duplication prevention. Two inline
+        scripts should be loaded.
       </p>
     </div>
   )
-}
\ No newline at end of file
+}
diff --git a/e2e/react-start/basic/tests/script-duplication.spec.ts b/e2e/react-start/basic/tests/script-duplication.spec.ts
index a60d49fb325..aa5f44bbebd 100644
--- a/e2e/react-start/basic/tests/script-duplication.spec.ts
+++ b/e2e/react-start/basic/tests/script-duplication.spec.ts
@@ -4,78 +4,82 @@ test.describe('Script Duplication Prevention', () => {
   test('should not create duplicate scripts on SSR route', async ({ page }) => {
     // Navigate directly to scripts route (SSR scenario)
     await page.goto('/scripts')
-    
+
     await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
-    
+
     // Count script tags with src="script.js"
     const scriptCount = await page.evaluate(() => {
       return document.querySelectorAll('script[src="script.js"]').length
     })
-    
+
     // Should have exactly one script tag
     expect(scriptCount).toBe(1)
-    
+
     // Verify the script executed correctly
     expect(await page.evaluate('window.SCRIPT_1')).toBe(true)
   })
 
-  test('should not create duplicate scripts during client-side navigation', async ({ page }) => {
+  test('should not create duplicate scripts during client-side navigation', async ({
+    page,
+  }) => {
     // Start from home page
     await page.goto('/')
-    
+
     // Navigate to scripts route (client-side navigation)
     await page.getByRole('link', { name: 'Scripts', exact: true }).click()
     await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
-    
+
     // Count script tags after first navigation
     const firstNavCount = await page.evaluate(() => {
       return document.querySelectorAll('script[src="script.js"]').length
     })
     expect(firstNavCount).toBe(1)
-    
+
     // Navigate away from scripts route
     await page.getByRole('link', { name: 'Home' }).click()
     await expect(page.getByRole('link', { name: 'Posts' })).toBeVisible()
-    
+
     // Navigate back to scripts route
     await page.getByRole('link', { name: 'Scripts', exact: true }).click()
     await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
-    
+
     // Count script tags after second navigation - should still be 1
     const secondNavCount = await page.evaluate(() => {
       return document.querySelectorAll('script[src="script.js"]').length
     })
     expect(secondNavCount).toBe(1)
-    
+
     // Verify the script is still working
     expect(await page.evaluate('window.SCRIPT_1')).toBe(true)
   })
 
-  test('should not create duplicate scripts with multiple navigation cycles', async ({ page }) => {
+  test('should not create duplicate scripts with multiple navigation cycles', async ({
+    page,
+  }) => {
     // Start from home page
     await page.goto('/')
-    
+
     // Navigate to scripts route multiple times
     for (let i = 0; i < 3; i++) {
       // Go to scripts
       await page.getByRole('link', { name: 'Scripts', exact: true }).click()
       await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
-      
+
       // Go back to home
       await page.getByRole('link', { name: 'Home' }).click()
       await expect(page.getByRole('link', { name: 'Posts' })).toBeVisible()
     }
-    
+
     // Final navigation to scripts
     await page.getByRole('link', { name: 'Scripts', exact: true }).click()
     await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
-    
+
     // Count script tags - should still be exactly 1
     const finalCount = await page.evaluate(() => {
       return document.querySelectorAll('script[src="script.js"]').length
     })
     expect(finalCount).toBe(1)
-    
+
     // Verify the script is still working
     expect(await page.evaluate('window.SCRIPT_1')).toBe(true)
   })
@@ -83,68 +87,84 @@ test.describe('Script Duplication Prevention', () => {
   test('should not create duplicate inline scripts', async ({ page }) => {
     // Navigate directly to inline scripts route (SSR scenario)
     await page.goto('/inline-scripts')
-    
-    await expect(page.getByTestId('inline-scripts-test-heading')).toBeInViewport()
-    
+
+    await expect(
+      page.getByTestId('inline-scripts-test-heading'),
+    ).toBeInViewport()
+
     // Count specific inline scripts
     const script1Count = await page.evaluate(() => {
       const scripts = Array.from(document.querySelectorAll('script:not([src])'))
-      return scripts.filter(script => 
-        script.textContent && script.textContent.includes('window.INLINE_SCRIPT_1 = true')
+      return scripts.filter(
+        (script) =>
+          script.textContent &&
+          script.textContent.includes('window.INLINE_SCRIPT_1 = true'),
       ).length
     })
-    
+
     const script2Count = await page.evaluate(() => {
       const scripts = Array.from(document.querySelectorAll('script:not([src])'))
-      return scripts.filter(script => 
-        script.textContent && script.textContent.includes('window.INLINE_SCRIPT_2 = "test"')
+      return scripts.filter(
+        (script) =>
+          script.textContent &&
+          script.textContent.includes('window.INLINE_SCRIPT_2 = "test"'),
       ).length
     })
-    
+
     // Should have exactly one of each inline script
     expect(script1Count).toBe(1)
     expect(script2Count).toBe(1)
-    
+
     // Verify the scripts executed correctly
     expect(await page.evaluate('window.INLINE_SCRIPT_1')).toBe(true)
     expect(await page.evaluate('window.INLINE_SCRIPT_2')).toBe('test')
   })
 
-  test('should not create duplicate inline scripts during client-side navigation', async ({ page }) => {
+  test('should not create duplicate inline scripts during client-side navigation', async ({
+    page,
+  }) => {
     // Start from home page
     await page.goto('/')
-    
+
     // Navigate to inline scripts route (client-side navigation)
     await page.getByRole('link', { name: 'Inline Scripts' }).click()
-    await expect(page.getByTestId('inline-scripts-test-heading')).toBeInViewport()
-    
+    await expect(
+      page.getByTestId('inline-scripts-test-heading'),
+    ).toBeInViewport()
+
     // Count inline scripts after first navigation
     const firstNavScript1Count = await page.evaluate(() => {
       const scripts = Array.from(document.querySelectorAll('script:not([src])'))
-      return scripts.filter(script => 
-        script.textContent && script.textContent.includes('window.INLINE_SCRIPT_1 = true')
+      return scripts.filter(
+        (script) =>
+          script.textContent &&
+          script.textContent.includes('window.INLINE_SCRIPT_1 = true'),
       ).length
     })
     expect(firstNavScript1Count).toBe(1)
-    
+
     // Navigate away and back
     await page.getByRole('link', { name: 'Home' }).click()
     await expect(page.getByRole('link', { name: 'Posts' })).toBeVisible()
-    
+
     await page.getByRole('link', { name: 'Inline Scripts' }).click()
-    await expect(page.getByTestId('inline-scripts-test-heading')).toBeInViewport()
-    
+    await expect(
+      page.getByTestId('inline-scripts-test-heading'),
+    ).toBeInViewport()
+
     // Count inline scripts after second navigation - should still be 1
     const secondNavScript1Count = await page.evaluate(() => {
       const scripts = Array.from(document.querySelectorAll('script:not([src])'))
-      return scripts.filter(script => 
-        script.textContent && script.textContent.includes('window.INLINE_SCRIPT_1 = true')
+      return scripts.filter(
+        (script) =>
+          script.textContent &&
+          script.textContent.includes('window.INLINE_SCRIPT_1 = true'),
       ).length
     })
     expect(secondNavScript1Count).toBe(1)
-    
+
     // Verify the scripts are still working
     expect(await page.evaluate('window.INLINE_SCRIPT_1')).toBe(true)
     expect(await page.evaluate('window.INLINE_SCRIPT_2')).toBe('test')
   })
-})
\ No newline at end of file
+})
diff --git a/e2e/solid-start/basic/src/routes/inline-scripts.tsx b/e2e/solid-start/basic/src/routes/inline-scripts.tsx
index 31cf5b9ab6e..a2833c2ae1e 100644
--- a/e2e/solid-start/basic/src/routes/inline-scripts.tsx
+++ b/e2e/solid-start/basic/src/routes/inline-scripts.tsx
@@ -4,12 +4,14 @@ export const Route = createFileRoute('/inline-scripts')({
   head: () => ({
     scripts: [
       {
-        children: 'window.INLINE_SCRIPT_1 = true; console.log("Inline script 1 executed");'
+        children:
+          'window.INLINE_SCRIPT_1 = true; console.log("Inline script 1 executed");',
       },
       {
-        children: 'window.INLINE_SCRIPT_2 = "test"; console.log("Inline script 2 executed");',
-        type: 'text/javascript'
-      }
+        children:
+          'window.INLINE_SCRIPT_2 = "test"; console.log("Inline script 2 executed");',
+        type: 'text/javascript',
+      },
     ],
   }),
   component: InlineScriptsComponent,
@@ -20,8 +22,9 @@ function InlineScriptsComponent() {
     <div class="p-2">
       <h3 data-testid="inline-scripts-test-heading">Inline Scripts Test</h3>
       <p>
-        This route tests inline script duplication prevention. Two inline scripts should be loaded.
+        This route tests inline script duplication prevention. Two inline
+        scripts should be loaded.
       </p>
     </div>
   )
-}
\ No newline at end of file
+}
diff --git a/e2e/solid-start/basic/tests/script-duplication.spec.ts b/e2e/solid-start/basic/tests/script-duplication.spec.ts
index a60d49fb325..aa5f44bbebd 100644
--- a/e2e/solid-start/basic/tests/script-duplication.spec.ts
+++ b/e2e/solid-start/basic/tests/script-duplication.spec.ts
@@ -4,78 +4,82 @@ test.describe('Script Duplication Prevention', () => {
   test('should not create duplicate scripts on SSR route', async ({ page }) => {
     // Navigate directly to scripts route (SSR scenario)
     await page.goto('/scripts')
-    
+
     await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
-    
+
     // Count script tags with src="script.js"
     const scriptCount = await page.evaluate(() => {
       return document.querySelectorAll('script[src="script.js"]').length
     })
-    
+
     // Should have exactly one script tag
     expect(scriptCount).toBe(1)
-    
+
     // Verify the script executed correctly
     expect(await page.evaluate('window.SCRIPT_1')).toBe(true)
   })
 
-  test('should not create duplicate scripts during client-side navigation', async ({ page }) => {
+  test('should not create duplicate scripts during client-side navigation', async ({
+    page,
+  }) => {
     // Start from home page
     await page.goto('/')
-    
+
     // Navigate to scripts route (client-side navigation)
     await page.getByRole('link', { name: 'Scripts', exact: true }).click()
     await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
-    
+
     // Count script tags after first navigation
     const firstNavCount = await page.evaluate(() => {
       return document.querySelectorAll('script[src="script.js"]').length
     })
     expect(firstNavCount).toBe(1)
-    
+
     // Navigate away from scripts route
     await page.getByRole('link', { name: 'Home' }).click()
     await expect(page.getByRole('link', { name: 'Posts' })).toBeVisible()
-    
+
     // Navigate back to scripts route
     await page.getByRole('link', { name: 'Scripts', exact: true }).click()
     await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
-    
+
     // Count script tags after second navigation - should still be 1
     const secondNavCount = await page.evaluate(() => {
       return document.querySelectorAll('script[src="script.js"]').length
     })
     expect(secondNavCount).toBe(1)
-    
+
     // Verify the script is still working
     expect(await page.evaluate('window.SCRIPT_1')).toBe(true)
   })
 
-  test('should not create duplicate scripts with multiple navigation cycles', async ({ page }) => {
+  test('should not create duplicate scripts with multiple navigation cycles', async ({
+    page,
+  }) => {
     // Start from home page
     await page.goto('/')
-    
+
     // Navigate to scripts route multiple times
     for (let i = 0; i < 3; i++) {
       // Go to scripts
       await page.getByRole('link', { name: 'Scripts', exact: true }).click()
       await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
-      
+
       // Go back to home
       await page.getByRole('link', { name: 'Home' }).click()
       await expect(page.getByRole('link', { name: 'Posts' })).toBeVisible()
     }
-    
+
     // Final navigation to scripts
     await page.getByRole('link', { name: 'Scripts', exact: true }).click()
     await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
-    
+
     // Count script tags - should still be exactly 1
     const finalCount = await page.evaluate(() => {
       return document.querySelectorAll('script[src="script.js"]').length
     })
     expect(finalCount).toBe(1)
-    
+
     // Verify the script is still working
     expect(await page.evaluate('window.SCRIPT_1')).toBe(true)
   })
@@ -83,68 +87,84 @@ test.describe('Script Duplication Prevention', () => {
   test('should not create duplicate inline scripts', async ({ page }) => {
     // Navigate directly to inline scripts route (SSR scenario)
     await page.goto('/inline-scripts')
-    
-    await expect(page.getByTestId('inline-scripts-test-heading')).toBeInViewport()
-    
+
+    await expect(
+      page.getByTestId('inline-scripts-test-heading'),
+    ).toBeInViewport()
+
     // Count specific inline scripts
     const script1Count = await page.evaluate(() => {
       const scripts = Array.from(document.querySelectorAll('script:not([src])'))
-      return scripts.filter(script => 
-        script.textContent && script.textContent.includes('window.INLINE_SCRIPT_1 = true')
+      return scripts.filter(
+        (script) =>
+          script.textContent &&
+          script.textContent.includes('window.INLINE_SCRIPT_1 = true'),
       ).length
     })
-    
+
     const script2Count = await page.evaluate(() => {
       const scripts = Array.from(document.querySelectorAll('script:not([src])'))
-      return scripts.filter(script => 
-        script.textContent && script.textContent.includes('window.INLINE_SCRIPT_2 = "test"')
+      return scripts.filter(
+        (script) =>
+          script.textContent &&
+          script.textContent.includes('window.INLINE_SCRIPT_2 = "test"'),
       ).length
     })
-    
+
     // Should have exactly one of each inline script
     expect(script1Count).toBe(1)
     expect(script2Count).toBe(1)
-    
+
     // Verify the scripts executed correctly
     expect(await page.evaluate('window.INLINE_SCRIPT_1')).toBe(true)
     expect(await page.evaluate('window.INLINE_SCRIPT_2')).toBe('test')
   })
 
-  test('should not create duplicate inline scripts during client-side navigation', async ({ page }) => {
+  test('should not create duplicate inline scripts during client-side navigation', async ({
+    page,
+  }) => {
     // Start from home page
     await page.goto('/')
-    
+
     // Navigate to inline scripts route (client-side navigation)
     await page.getByRole('link', { name: 'Inline Scripts' }).click()
-    await expect(page.getByTestId('inline-scripts-test-heading')).toBeInViewport()
-    
+    await expect(
+      page.getByTestId('inline-scripts-test-heading'),
+    ).toBeInViewport()
+
     // Count inline scripts after first navigation
     const firstNavScript1Count = await page.evaluate(() => {
       const scripts = Array.from(document.querySelectorAll('script:not([src])'))
-      return scripts.filter(script => 
-        script.textContent && script.textContent.includes('window.INLINE_SCRIPT_1 = true')
+      return scripts.filter(
+        (script) =>
+          script.textContent &&
+          script.textContent.includes('window.INLINE_SCRIPT_1 = true'),
       ).length
     })
     expect(firstNavScript1Count).toBe(1)
-    
+
     // Navigate away and back
     await page.getByRole('link', { name: 'Home' }).click()
     await expect(page.getByRole('link', { name: 'Posts' })).toBeVisible()
-    
+
     await page.getByRole('link', { name: 'Inline Scripts' }).click()
-    await expect(page.getByTestId('inline-scripts-test-heading')).toBeInViewport()
-    
+    await expect(
+      page.getByTestId('inline-scripts-test-heading'),
+    ).toBeInViewport()
+
     // Count inline scripts after second navigation - should still be 1
     const secondNavScript1Count = await page.evaluate(() => {
       const scripts = Array.from(document.querySelectorAll('script:not([src])'))
-      return scripts.filter(script => 
-        script.textContent && script.textContent.includes('window.INLINE_SCRIPT_1 = true')
+      return scripts.filter(
+        (script) =>
+          script.textContent &&
+          script.textContent.includes('window.INLINE_SCRIPT_1 = true'),
       ).length
     })
     expect(secondNavScript1Count).toBe(1)
-    
+
     // Verify the scripts are still working
     expect(await page.evaluate('window.INLINE_SCRIPT_1')).toBe(true)
     expect(await page.evaluate('window.INLINE_SCRIPT_2')).toBe('test')
   })
-})
\ No newline at end of file
+})

From b9d38a16c77b08394b59ac86d83218959d2719d3 Mon Sep 17 00:00:00 2001
From: wookhyung <qpflapffhs76@gmail.com>
Date: Sun, 7 Sep 2025 16:35:54 +0900
Subject: [PATCH 3/9] fix(router): use router for script tag rendering

---
 packages/react-router/src/Asset.tsx | 5 ++++-
 packages/solid-router/src/Asset.tsx | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/react-router/src/Asset.tsx b/packages/react-router/src/Asset.tsx
index a555f259ede..6a4c719ff03 100644
--- a/packages/react-router/src/Asset.tsx
+++ b/packages/react-router/src/Asset.tsx
@@ -1,5 +1,6 @@
 import * as React from 'react'
 import type { RouterManagedTag } from '@tanstack/router-core'
+import { useRouter } from './useRouter'
 
 interface ScriptAttrs {
   [key: string]: string | boolean | undefined
@@ -44,6 +45,8 @@ function Script({
   attrs?: ScriptAttrs
   children?: string
 }) {
+  const router = useRouter()
+
   React.useEffect(() => {
     if (attrs?.src) {
       const existingScript = document.querySelector(
@@ -115,7 +118,7 @@ function Script({
     return undefined
   }, [attrs, children])
 
-  if (typeof window !== 'undefined') {
+  if (!router.isServer) {
     return null
   }
 
diff --git a/packages/solid-router/src/Asset.tsx b/packages/solid-router/src/Asset.tsx
index f866012b515..d00bc3214a0 100644
--- a/packages/solid-router/src/Asset.tsx
+++ b/packages/solid-router/src/Asset.tsx
@@ -1,5 +1,6 @@
 import { Meta, Style, Title } from '@solidjs/meta'
 import { onCleanup, onMount } from 'solid-js'
+import { useRouter } from './useRouter'
 import type { RouterManagedTag } from '@tanstack/router-core'
 import type { JSX } from 'solid-js'
 
@@ -36,6 +37,8 @@ function Script({
   attrs?: ScriptAttrs
   children?: string
 }): JSX.Element | null {
+  const router = useRouter()
+
   onMount(() => {
     if (attrs?.src) {
       const existingScript = document.querySelector(
@@ -95,7 +98,7 @@ function Script({
     }
   })
 
-  if (typeof window !== 'undefined') {
+  if (!router.isServer) {
     return null
   }
 

From 93d0f16c1aa4995fa4d64f3470199a9d7c535fce Mon Sep 17 00:00:00 2001
From: wookhyung <qpflapffhs76@gmail.com>
Date: Mon, 8 Sep 2025 10:20:51 +0900
Subject: [PATCH 4/9] fix(solid-router): prevent null router access in Script
 component during SSR

---
 packages/solid-router/src/Asset.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/solid-router/src/Asset.tsx b/packages/solid-router/src/Asset.tsx
index d00bc3214a0..adc924113d0 100644
--- a/packages/solid-router/src/Asset.tsx
+++ b/packages/solid-router/src/Asset.tsx
@@ -98,7 +98,7 @@ function Script({
     }
   })
 
-  if (!router.isServer) {
+  if (router && !router.isServer) {
     return null
   }
 

From c72b7e8a50e4ad4e7ff90fccb9c570ccf4099ebb Mon Sep 17 00:00:00 2001
From: wookhyung <qpflapffhs76@gmail.com>
Date: Mon, 8 Sep 2025 10:21:20 +0900
Subject: [PATCH 5/9] style(react-router): reorder imports in Asset.tsx

---
 packages/react-router/src/Asset.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-router/src/Asset.tsx b/packages/react-router/src/Asset.tsx
index 6a4c719ff03..f963c0a70c0 100644
--- a/packages/react-router/src/Asset.tsx
+++ b/packages/react-router/src/Asset.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
-import type { RouterManagedTag } from '@tanstack/router-core'
 import { useRouter } from './useRouter'
+import type { RouterManagedTag } from '@tanstack/router-core'
 
 interface ScriptAttrs {
   [key: string]: string | boolean | undefined

From cd2bffb2e3f9bdea24952707471234780277cb46 Mon Sep 17 00:00:00 2001
From: wookhyung <qpflapffhs76@gmail.com>
Date: Tue, 9 Sep 2025 11:05:19 +0900
Subject: [PATCH 6/9] test: remove comments

---
 .../basic/tests/script-duplication.spec.ts    | 27 ----------------
 .../basic/tests/script-duplication.spec.ts    | 32 -------------------
 2 files changed, 59 deletions(-)

diff --git a/e2e/react-start/basic/tests/script-duplication.spec.ts b/e2e/react-start/basic/tests/script-duplication.spec.ts
index aa5f44bbebd..2ed98a3a73f 100644
--- a/e2e/react-start/basic/tests/script-duplication.spec.ts
+++ b/e2e/react-start/basic/tests/script-duplication.spec.ts
@@ -2,97 +2,77 @@ import { expect, test } from '@playwright/test'
 
 test.describe('Script Duplication Prevention', () => {
   test('should not create duplicate scripts on SSR route', async ({ page }) => {
-    // Navigate directly to scripts route (SSR scenario)
     await page.goto('/scripts')
 
     await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
 
-    // Count script tags with src="script.js"
     const scriptCount = await page.evaluate(() => {
       return document.querySelectorAll('script[src="script.js"]').length
     })
 
-    // Should have exactly one script tag
     expect(scriptCount).toBe(1)
 
-    // Verify the script executed correctly
     expect(await page.evaluate('window.SCRIPT_1')).toBe(true)
   })
 
   test('should not create duplicate scripts during client-side navigation', async ({
     page,
   }) => {
-    // Start from home page
     await page.goto('/')
 
-    // Navigate to scripts route (client-side navigation)
     await page.getByRole('link', { name: 'Scripts', exact: true }).click()
     await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
 
-    // Count script tags after first navigation
     const firstNavCount = await page.evaluate(() => {
       return document.querySelectorAll('script[src="script.js"]').length
     })
     expect(firstNavCount).toBe(1)
 
-    // Navigate away from scripts route
     await page.getByRole('link', { name: 'Home' }).click()
     await expect(page.getByRole('link', { name: 'Posts' })).toBeVisible()
 
-    // Navigate back to scripts route
     await page.getByRole('link', { name: 'Scripts', exact: true }).click()
     await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
 
-    // Count script tags after second navigation - should still be 1
     const secondNavCount = await page.evaluate(() => {
       return document.querySelectorAll('script[src="script.js"]').length
     })
     expect(secondNavCount).toBe(1)
 
-    // Verify the script is still working
     expect(await page.evaluate('window.SCRIPT_1')).toBe(true)
   })
 
   test('should not create duplicate scripts with multiple navigation cycles', async ({
     page,
   }) => {
-    // Start from home page
     await page.goto('/')
 
-    // Navigate to scripts route multiple times
     for (let i = 0; i < 3; i++) {
-      // Go to scripts
       await page.getByRole('link', { name: 'Scripts', exact: true }).click()
       await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
 
-      // Go back to home
       await page.getByRole('link', { name: 'Home' }).click()
       await expect(page.getByRole('link', { name: 'Posts' })).toBeVisible()
     }
 
-    // Final navigation to scripts
     await page.getByRole('link', { name: 'Scripts', exact: true }).click()
     await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
 
-    // Count script tags - should still be exactly 1
     const finalCount = await page.evaluate(() => {
       return document.querySelectorAll('script[src="script.js"]').length
     })
     expect(finalCount).toBe(1)
 
-    // Verify the script is still working
     expect(await page.evaluate('window.SCRIPT_1')).toBe(true)
   })
 
   test('should not create duplicate inline scripts', async ({ page }) => {
-    // Navigate directly to inline scripts route (SSR scenario)
     await page.goto('/inline-scripts')
 
     await expect(
       page.getByTestId('inline-scripts-test-heading'),
     ).toBeInViewport()
 
-    // Count specific inline scripts
     const script1Count = await page.evaluate(() => {
       const scripts = Array.from(document.querySelectorAll('script:not([src])'))
       return scripts.filter(
@@ -111,11 +91,9 @@ test.describe('Script Duplication Prevention', () => {
       ).length
     })
 
-    // Should have exactly one of each inline script
     expect(script1Count).toBe(1)
     expect(script2Count).toBe(1)
 
-    // Verify the scripts executed correctly
     expect(await page.evaluate('window.INLINE_SCRIPT_1')).toBe(true)
     expect(await page.evaluate('window.INLINE_SCRIPT_2')).toBe('test')
   })
@@ -123,16 +101,13 @@ test.describe('Script Duplication Prevention', () => {
   test('should not create duplicate inline scripts during client-side navigation', async ({
     page,
   }) => {
-    // Start from home page
     await page.goto('/')
 
-    // Navigate to inline scripts route (client-side navigation)
     await page.getByRole('link', { name: 'Inline Scripts' }).click()
     await expect(
       page.getByTestId('inline-scripts-test-heading'),
     ).toBeInViewport()
 
-    // Count inline scripts after first navigation
     const firstNavScript1Count = await page.evaluate(() => {
       const scripts = Array.from(document.querySelectorAll('script:not([src])'))
       return scripts.filter(
@@ -143,7 +118,6 @@ test.describe('Script Duplication Prevention', () => {
     })
     expect(firstNavScript1Count).toBe(1)
 
-    // Navigate away and back
     await page.getByRole('link', { name: 'Home' }).click()
     await expect(page.getByRole('link', { name: 'Posts' })).toBeVisible()
 
@@ -152,7 +126,6 @@ test.describe('Script Duplication Prevention', () => {
       page.getByTestId('inline-scripts-test-heading'),
     ).toBeInViewport()
 
-    // Count inline scripts after second navigation - should still be 1
     const secondNavScript1Count = await page.evaluate(() => {
       const scripts = Array.from(document.querySelectorAll('script:not([src])'))
       return scripts.filter(
diff --git a/e2e/solid-start/basic/tests/script-duplication.spec.ts b/e2e/solid-start/basic/tests/script-duplication.spec.ts
index aa5f44bbebd..b6c9e9e2fd4 100644
--- a/e2e/solid-start/basic/tests/script-duplication.spec.ts
+++ b/e2e/solid-start/basic/tests/script-duplication.spec.ts
@@ -2,97 +2,74 @@ import { expect, test } from '@playwright/test'
 
 test.describe('Script Duplication Prevention', () => {
   test('should not create duplicate scripts on SSR route', async ({ page }) => {
-    // Navigate directly to scripts route (SSR scenario)
     await page.goto('/scripts')
 
     await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
 
-    // Count script tags with src="script.js"
     const scriptCount = await page.evaluate(() => {
       return document.querySelectorAll('script[src="script.js"]').length
     })
 
-    // Should have exactly one script tag
     expect(scriptCount).toBe(1)
-
-    // Verify the script executed correctly
     expect(await page.evaluate('window.SCRIPT_1')).toBe(true)
   })
 
   test('should not create duplicate scripts during client-side navigation', async ({
     page,
   }) => {
-    // Start from home page
     await page.goto('/')
 
-    // Navigate to scripts route (client-side navigation)
     await page.getByRole('link', { name: 'Scripts', exact: true }).click()
     await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
 
-    // Count script tags after first navigation
     const firstNavCount = await page.evaluate(() => {
       return document.querySelectorAll('script[src="script.js"]').length
     })
     expect(firstNavCount).toBe(1)
 
-    // Navigate away from scripts route
     await page.getByRole('link', { name: 'Home' }).click()
     await expect(page.getByRole('link', { name: 'Posts' })).toBeVisible()
 
-    // Navigate back to scripts route
     await page.getByRole('link', { name: 'Scripts', exact: true }).click()
     await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
 
-    // Count script tags after second navigation - should still be 1
     const secondNavCount = await page.evaluate(() => {
       return document.querySelectorAll('script[src="script.js"]').length
     })
     expect(secondNavCount).toBe(1)
-
-    // Verify the script is still working
     expect(await page.evaluate('window.SCRIPT_1')).toBe(true)
   })
 
   test('should not create duplicate scripts with multiple navigation cycles', async ({
     page,
   }) => {
-    // Start from home page
     await page.goto('/')
 
-    // Navigate to scripts route multiple times
     for (let i = 0; i < 3; i++) {
-      // Go to scripts
       await page.getByRole('link', { name: 'Scripts', exact: true }).click()
       await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
 
-      // Go back to home
       await page.getByRole('link', { name: 'Home' }).click()
       await expect(page.getByRole('link', { name: 'Posts' })).toBeVisible()
     }
 
-    // Final navigation to scripts
     await page.getByRole('link', { name: 'Scripts', exact: true }).click()
     await expect(page.getByTestId('scripts-test-heading')).toBeInViewport()
 
-    // Count script tags - should still be exactly 1
     const finalCount = await page.evaluate(() => {
       return document.querySelectorAll('script[src="script.js"]').length
     })
     expect(finalCount).toBe(1)
-
-    // Verify the script is still working
     expect(await page.evaluate('window.SCRIPT_1')).toBe(true)
   })
 
   test('should not create duplicate inline scripts', async ({ page }) => {
-    // Navigate directly to inline scripts route (SSR scenario)
     await page.goto('/inline-scripts')
 
     await expect(
       page.getByTestId('inline-scripts-test-heading'),
     ).toBeInViewport()
 
-    // Count specific inline scripts
     const script1Count = await page.evaluate(() => {
       const scripts = Array.from(document.querySelectorAll('script:not([src])'))
       return scripts.filter(
@@ -111,11 +88,8 @@ test.describe('Script Duplication Prevention', () => {
       ).length
     })
 
-    // Should have exactly one of each inline script
     expect(script1Count).toBe(1)
     expect(script2Count).toBe(1)
-
-    // Verify the scripts executed correctly
     expect(await page.evaluate('window.INLINE_SCRIPT_1')).toBe(true)
     expect(await page.evaluate('window.INLINE_SCRIPT_2')).toBe('test')
   })
@@ -123,16 +97,13 @@ test.describe('Script Duplication Prevention', () => {
   test('should not create duplicate inline scripts during client-side navigation', async ({
     page,
   }) => {
-    // Start from home page
     await page.goto('/')
 
-    // Navigate to inline scripts route (client-side navigation)
     await page.getByRole('link', { name: 'Inline Scripts' }).click()
     await expect(
       page.getByTestId('inline-scripts-test-heading'),
     ).toBeInViewport()
 
-    // Count inline scripts after first navigation
     const firstNavScript1Count = await page.evaluate(() => {
       const scripts = Array.from(document.querySelectorAll('script:not([src])'))
       return scripts.filter(
@@ -143,7 +114,6 @@ test.describe('Script Duplication Prevention', () => {
     })
     expect(firstNavScript1Count).toBe(1)
 
-    // Navigate away and back
     await page.getByRole('link', { name: 'Home' }).click()
     await expect(page.getByRole('link', { name: 'Posts' })).toBeVisible()
 
@@ -152,7 +122,6 @@ test.describe('Script Duplication Prevention', () => {
       page.getByTestId('inline-scripts-test-heading'),
     ).toBeInViewport()
 
-    // Count inline scripts after second navigation - should still be 1
     const secondNavScript1Count = await page.evaluate(() => {
       const scripts = Array.from(document.querySelectorAll('script:not([src])'))
       return scripts.filter(
@@ -163,7 +132,6 @@ test.describe('Script Duplication Prevention', () => {
     })
     expect(secondNavScript1Count).toBe(1)
 
-    // Verify the scripts are still working
     expect(await page.evaluate('window.INLINE_SCRIPT_1')).toBe(true)
     expect(await page.evaluate('window.INLINE_SCRIPT_2')).toBe('test')
   })

From e4244270a7f03ba5de8d003a6581e98691bc0f9d Mon Sep 17 00:00:00 2001
From: wookhyung <qpflapffhs76@gmail.com>
Date: Wed, 10 Sep 2025 09:12:28 +0900
Subject: [PATCH 7/9] refactor(router): improve script deduplication with URL
 normalization and type safety

---
 packages/react-router/src/Asset.tsx | 28 +++++++++++++++++++++----
 packages/solid-router/src/Asset.tsx | 32 ++++++++++++++++++++++++-----
 2 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/packages/react-router/src/Asset.tsx b/packages/react-router/src/Asset.tsx
index f963c0a70c0..aa2ad38d9a9 100644
--- a/packages/react-router/src/Asset.tsx
+++ b/packages/react-router/src/Asset.tsx
@@ -49,9 +49,17 @@ function Script({
 
   React.useEffect(() => {
     if (attrs?.src) {
-      const existingScript = document.querySelector(
-        `script[src="${attrs.src}"]`,
-      )
+      const normSrc = (() => {
+        try {
+          return new URL(attrs.src, window.location.href).href
+        } catch {
+          return attrs.src
+        }
+      })()
+      const existingScript = Array.from(
+        document.querySelectorAll('script[src]'),
+      ).find((el) => (el as HTMLScriptElement).src === normSrc)
+
       if (existingScript) {
         return
       }
@@ -81,9 +89,21 @@ function Script({
     }
 
     if (typeof children === 'string') {
+      const typeAttr = attrs?.type ?? 'text/javascript'
+      const nonceAttr = attrs?.nonce
       const existingScript = Array.from(
         document.querySelectorAll('script:not([src])'),
-      ).find((script) => script.textContent === children)
+      ).find((el) => {
+        if (!(el instanceof HTMLScriptElement)) return false
+        const sType = el.getAttribute('type') ?? 'text/javascript'
+        const sNonce = el.getAttribute('nonce') ?? undefined
+        return (
+          el.textContent === children &&
+          sType === typeAttr &&
+          sNonce === nonceAttr
+        )
+      })
+
       if (existingScript) {
         return
       }
diff --git a/packages/solid-router/src/Asset.tsx b/packages/solid-router/src/Asset.tsx
index adc924113d0..03c824f5b2c 100644
--- a/packages/solid-router/src/Asset.tsx
+++ b/packages/solid-router/src/Asset.tsx
@@ -41,9 +41,17 @@ function Script({
 
   onMount(() => {
     if (attrs?.src) {
-      const existingScript = document.querySelector(
-        `script[src="${attrs.src}"]`,
-      )
+      const normSrc = (() => {
+        try {
+          return new URL(attrs.src, window.location.href).href
+        } catch {
+          return attrs.src
+        }
+      })()
+      const existingScript = Array.from(
+        document.querySelectorAll('script[src]'),
+      ).find((el) => (el as HTMLScriptElement).src === normSrc)
+
       if (existingScript) {
         return
       }
@@ -66,10 +74,24 @@ function Script({
           script.parentNode.removeChild(script)
         }
       })
-    } else if (typeof children === 'string') {
+    }
+
+    if (typeof children === 'string') {
+      const typeAttr = attrs?.type ?? 'text/javascript'
+      const nonceAttr = attrs?.nonce
       const existingScript = Array.from(
         document.querySelectorAll('script:not([src])'),
-      ).find((script) => script.textContent === children)
+      ).find((el) => {
+        if (!(el instanceof HTMLScriptElement)) return false
+        const sType = el.getAttribute('type') ?? 'text/javascript'
+        const sNonce = el.getAttribute('nonce') ?? undefined
+        return (
+          el.textContent === children &&
+          sType === typeAttr &&
+          sNonce === nonceAttr
+        )
+      })
+
       if (existingScript) {
         return
       }

From 148058747d83f9b8c2bb103b74511c5d35564c13 Mon Sep 17 00:00:00 2001
From: wookhyung <qpflapffhs76@gmail.com>
Date: Wed, 10 Sep 2025 09:24:06 +0900
Subject: [PATCH 8/9] fix(router): improve type safety for script attributes

---
 packages/react-router/src/Asset.tsx | 6 ++++--
 packages/solid-router/src/Asset.tsx | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/react-router/src/Asset.tsx b/packages/react-router/src/Asset.tsx
index aa2ad38d9a9..e9c7419d054 100644
--- a/packages/react-router/src/Asset.tsx
+++ b/packages/react-router/src/Asset.tsx
@@ -89,8 +89,10 @@ function Script({
     }
 
     if (typeof children === 'string') {
-      const typeAttr = attrs?.type ?? 'text/javascript'
-      const nonceAttr = attrs?.nonce
+      const typeAttr =
+        typeof attrs?.type === 'string' ? attrs.type : 'text/javascript'
+      const nonceAttr =
+        typeof attrs?.nonce === 'string' ? attrs.nonce : undefined
       const existingScript = Array.from(
         document.querySelectorAll('script:not([src])'),
       ).find((el) => {
diff --git a/packages/solid-router/src/Asset.tsx b/packages/solid-router/src/Asset.tsx
index 03c824f5b2c..0beace78578 100644
--- a/packages/solid-router/src/Asset.tsx
+++ b/packages/solid-router/src/Asset.tsx
@@ -77,8 +77,10 @@ function Script({
     }
 
     if (typeof children === 'string') {
-      const typeAttr = attrs?.type ?? 'text/javascript'
-      const nonceAttr = attrs?.nonce
+      const typeAttr =
+        typeof attrs?.type === 'string' ? attrs.type : 'text/javascript'
+      const nonceAttr =
+        typeof attrs?.nonce === 'string' ? attrs.nonce : undefined
       const existingScript = Array.from(
         document.querySelectorAll('script:not([src])'),
       ).find((el) => {

From 22b268fba725151dddb4e64da8479b75b80f4bed Mon Sep 17 00:00:00 2001
From: wookhyung <qpflapffhs76@gmail.com>
Date: Wed, 10 Sep 2025 11:58:18 +0900
Subject: [PATCH 9/9] fix(router): normalize URL base for script attributes

---
 packages/react-router/src/Asset.tsx | 3 ++-
 packages/solid-router/src/Asset.tsx | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/react-router/src/Asset.tsx b/packages/react-router/src/Asset.tsx
index e9c7419d054..266261d2e36 100644
--- a/packages/react-router/src/Asset.tsx
+++ b/packages/react-router/src/Asset.tsx
@@ -51,7 +51,8 @@ function Script({
     if (attrs?.src) {
       const normSrc = (() => {
         try {
-          return new URL(attrs.src, window.location.href).href
+          const base = document.baseURI || window.location.href
+          return new URL(attrs.src, base).href
         } catch {
           return attrs.src
         }
diff --git a/packages/solid-router/src/Asset.tsx b/packages/solid-router/src/Asset.tsx
index 0beace78578..d7bc725debd 100644
--- a/packages/solid-router/src/Asset.tsx
+++ b/packages/solid-router/src/Asset.tsx
@@ -43,7 +43,8 @@ function Script({
     if (attrs?.src) {
       const normSrc = (() => {
         try {
-          return new URL(attrs.src, window.location.href).href
+          const base = document.baseURI || window.location.href
+          return new URL(attrs.src, base).href
         } catch {
           return attrs.src
         }