From 321e0b65cb9b9fb5ded5e085139e8c6bc9a4cd0d Mon Sep 17 00:00:00 2001
From: lithdew <kenta@lithdew.net>
Date: Mon, 12 Aug 2024 00:53:32 +0800
Subject: [PATCH] fix(start): remove debug log that causes dehydration errors

The debug 'Injected from Server: ' logs are not properly escaped,
causing dehydration to fail. These logs have been removed.

<ScriptOnce/> debug logs are removed, and the 'tsr-once' class
name set on <ScriptOnce/> elements has an extraneous space suffixed to
it which has been removed as well.
---
 packages/react-router/src/ScriptOnce.tsx | 15 +++------------
 packages/react-router/src/router.ts      |  9 ++-------
 packages/start/src/client/Meta.tsx       |  1 -
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/packages/react-router/src/ScriptOnce.tsx b/packages/react-router/src/ScriptOnce.tsx
index b1630ddcb2..5ce3a2903c 100644
--- a/packages/react-router/src/ScriptOnce.tsx
+++ b/packages/react-router/src/ScriptOnce.tsx
@@ -2,9 +2,8 @@
 export function ScriptOnce({
   className,
   children,
-  log,
   ...rest
-}: { children: string; log?: boolean } & React.HTMLProps<HTMLScriptElement>) {
+}: { children: string } & React.HTMLProps<HTMLScriptElement>) {
   if (typeof document !== 'undefined') {
     return null
   }
@@ -12,17 +11,9 @@ export function ScriptOnce({
   return (
     <script
       {...rest}
-      className={`tsr-once ${className || ''}`}
+      className={['tsr-once', className].filter(Boolean).join(' ')}
       dangerouslySetInnerHTML={{
-        __html: [
-          children,
-          (log ?? true) && process.env.NODE_ENV === 'development'
-            ? `console.info(\`Injected From Server:
-${children}\`)`
-            : '',
-        ]
-          .filter(Boolean)
-          .join('\n'),
+        __html: [children].filter(Boolean).join('\n'),
       }}
     />
   )
diff --git a/packages/react-router/src/router.ts b/packages/react-router/src/router.ts
index 44af4400d8..d7a9c97e41 100644
--- a/packages/react-router/src/router.ts
+++ b/packages/react-router/src/router.ts
@@ -2558,15 +2558,10 @@ export class Router<
     )
 
     this.streamedKeys.add(key)
-    const children = `__TSR__.streamedValues['${key}'] = { value: ${this.serializer?.(this.options.transformer.stringify(value))}}`
+    const children = `__TSR__.streamedValues['${key}'] = { value: ${this.serializer?.(this.options.transformer.stringify(value))} }`
 
     this.injectHtml(
-      `<script class='tsr-once'>${children}${
-        process.env.NODE_ENV === 'development'
-          ? `; console.info(\`Injected From Server:
-        ${children}\`)`
-          : ''
-      }; __TSR__.cleanScripts()</script>`,
+      `<script class='tsr-once'>${children}; __TSR__.cleanScripts()</script>`,
     )
   }
 
diff --git a/packages/start/src/client/Meta.tsx b/packages/start/src/client/Meta.tsx
index b020fea3d3..14057e76fc 100644
--- a/packages/start/src/client/Meta.tsx
+++ b/packages/start/src/client/Meta.tsx
@@ -118,7 +118,6 @@ export const useMetaElements = () => {
       ))}
       <>
         <ScriptOnce
-          log={false}
           children={`
 __TSR__ = {
   matches: [],