fix: Improve 404 page redirection logic and update SPA route handling

SameedIlyas · SameedIlyas · commit 6c6ff1d108e6 · 2025-11-28T10:13:41.000+05:00
diff --git a/demo/public/404.html b/demo/public/404.html
@@ -3,10 +3,20 @@
   <head>
     <meta charset="utf-8" />
     <script>
-      // Redirect to index.html and keep the original path
-      sessionStorage.redirect = location.pathname + location.search;
-      location.href = location.origin + location.pathname.replace(/\/[^\/]*$/, '/') + 'index.html';
+      const pathname = location.pathname;
+      const hasExtension = /\.[^\/]+$/.test(pathname);
+
+      // Only redirect SPA routes (no extension)
+      if (!hasExtension) {
+        const redirectUrl = encodeURIComponent(pathname + location.search);
+
+        // Redirect exactly once into SPA entry
+        location.replace("/react-hook-form-ai/index.html?redirect=" + redirectUrl);
+      }
     </script>
+    <title>404</title>
   </head>
-  <body></body>
+  <body>
+    <h1>404</h1>
+  </body>
 </html>
diff --git a/demo/src/main.tsx b/demo/src/main.tsx
@@ -4,11 +4,12 @@ import { BrowserRouter } from "react-router-dom";
 import App from "./App";
 import "./index.css";
 
-// Restore intended SPA route after GitHub Pages redirect fallback
-if (sessionStorage.redirect) {
-  const redirectUrl = sessionStorage.redirect as string;
-  delete sessionStorage.redirect;
-  history.replaceState(null, "", redirectUrl);
+// Read redirect query param
+const params = new URLSearchParams(location.search);
+const redirect = params.get("redirect");
+
+if (redirect) {
+  history.replaceState(null, "", redirect);
 }
 
 ReactDOM.render(
