@tanstack/react-router 1.95.5 → 1.97.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/react-router",
-  "version": "1.95.5",
+  "version": "1.97.0",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -53,7 +53,7 @@
     "jsesc": "^3.0.2",
     "tiny-invariant": "^1.3.3",
     "tiny-warning": "^1.0.3",
-    "@tanstack/history": "1.95.2"
+    "@tanstack/history": "1.97.0"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^6.6.3",

package/src/ScriptOnce.tsx

@@ -1,31 +1,14 @@
-import jsesc from 'jsesc'
+import { useRouter } from './useRouter'
 
 export function ScriptOnce({
-  className,
   children,
   log,
-  ...rest
-}: { children: string; log?: boolean } & React.HTMLProps<HTMLScriptElement>) {
-  if (typeof document !== 'undefined') {
-    return null
-  }
+}: {
+  children: string
+  log?: boolean
+}) {
+  const router = useRouter()
 
-  return (
-    <script
-      {...rest}
-      className={`tsr-once ${className || ''}`}
-      dangerouslySetInnerHTML={{
-        __html: [
-          children,
-          (log ?? true) && process.env.NODE_ENV === 'development'
-            ? `console.info(\`Injected From Server:
-${jsesc(children.toString(), { quotes: 'backtick' })}\`)`
-            : '',
-          'if (typeof __TSR__ !== "undefined") __TSR__.cleanScripts()',
-        ]
-          .filter(Boolean)
-          .join('\n'),
-      }}
-    />
-  )
+  router.injectScript(children, { logScript: log })
+  return null
 }

package/src/router.ts

@@ -6,6 +6,7 @@ import {
 import { Store, batch } from '@tanstack/react-store'
 import invariant from 'tiny-invariant'
 import warning from 'tiny-warning'
+import jsesc from 'jsesc'
 import { rootRouteId } from './root'
 import { defaultParseSearch, defaultStringifySearch } from './searchParams'
 import {
@@ -3100,7 +3101,7 @@ export class Router<
       `<script class='tsr-once'>${script}${
         process.env.NODE_ENV === 'development' && (opts?.logScript ?? true)
           ? `; console.info(\`Injected From Server:
-${script}\`)`
+${jsesc(script, { quotes: 'backtick' })}\`)`
           : ''
       }; if (typeof __TSR__ !== 'undefined') __TSR__.cleanScripts()</script>`,
     )