From 4daec445505e8331225ddebb347270705bbc2070 Mon Sep 17 00:00:00 2001
From: Lucas Smith <me@lucasjamessmith.me>
Date: Tue, 10 Mar 2026 12:15:15 +1100
Subject: [PATCH] fix: move window.__ENV__ script before client bundle to
 prevent stale fallback (#2592)

---
 apps/remix/app/root.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/remix/app/root.tsx b/apps/remix/app/root.tsx
index 76db197e0..da7d281dc 100644
--- a/apps/remix/app/root.tsx
+++ b/apps/remix/app/root.tsx
@@ -148,14 +148,14 @@ export function LayoutContent({ children }: { children: React.ReactNode }) {
           </TooltipProvider>
         </SessionProvider>
 
-        <ScrollRestoration />
-        <Scripts />
-
         <script
           dangerouslySetInnerHTML={{
             __html: `window.__ENV__ = ${JSON.stringify(publicEnv)}`,
           }}
         />
+
+        <ScrollRestoration />
+        <Scripts />
       </body>
     </html>
   );