react-on-rails-pro 16.5.1 → 16.6.0-rc.0

package/lib/tanstack-router/clientHydrate.js

@@ -36,6 +36,7 @@ railsContext: _railsContext, RouterProvider, RouterClient, createBrowserHistory,
     // A full remount creates a fresh router and may legitimately issue another load.
     const didTriggerPostHydrationLoadRef = useRef(false);
     const didInitializeSsrGlobalRef = useRef(false);
+    const didSetLegacySsrFlagRef = useRef(false);
     if (routerRef.current === null) {
         const router = options.createRouter();
         // Set browser history for client-side navigation
@@ -53,10 +54,15 @@ railsContext: _railsContext, RouterProvider, RouterClient, createBrowserHistory,
                 'router.hydrate() is required but not available on your TanStack Router version. ' +
                 'Ensure @tanstack/react-router >=1.139.0 <2.0.0 is installed and provides router.hydrate().');
         }
-        // Keep SSR mode enabled on hydration paths so Transitioner does not run
-        // a client-only initial load before hydration settles.
-        if (!hasSsrRouter && hasSsrPayload && router.ssr !== true) {
-            router.ssr = true;
+        // Legacy hydration path only: signal SSR mode so the Transitioner skips its
+        // initial router.load() call, preventing a hydration mismatch.  The object
+        // shape matches TanStack Router's internal $_TSR hydration contract (the
+        // Transitioner only checks truthiness).  The new ssrRouter/RouterClient path
+        // does not need this — RouterClient sets router.ssr internally via its own
+        // hydrate() function.
+        if (!hasSsrRouter && hasSsrPayload && !router.ssr) {
+            router.ssr = { manifest: undefined };
+            didSetLegacySsrFlagRef.current = true;
         }
         routerRef.current = router;
     }
@@ -86,10 +92,22 @@ railsContext: _railsContext, RouterProvider, RouterClient, createBrowserHistory,
         let cancelled = false;
         // `cancelled` only suppresses logging for a discarded mount. The in-flight load still
         // completes unless the router exposes a best-effort cancelLoad() hook.
-        router.load().catch((err) => {
+        router
+            .load()
+            .catch((err) => {
             if (!cancelled) {
                 console.error('react-on-rails-pro/tanstack-router: Error loading routes after hydration:', err);
             }
+        })
+            .finally(() => {
+            // Legacy hydration only: clear the temporary SSR hint after the first
+            // client load has completed so it cannot influence later navigations.
+            // Only clear when this module set it, so pre-existing router.ssr state
+            // from user code or upstream router internals is preserved.
+            if (didSetLegacySsrFlagRef.current) {
+                router.ssr = undefined;
+                didSetLegacySsrFlagRef.current = false;
+            }
         });
         return () => {
             cancelled = true;

package/lib/tanstack-router/serverRender.js

@@ -1,16 +1,5 @@
 import { createElement } from 'react';
 import { normalizeSearch } from "./utils.js";
-/**
- * Enables TanStack Router's internal SSR mode and verifies the flag is writable.
- */
-function enableRouterSsrMode(router) {
-    const routerWithSsrFlag = router;
-    routerWithSsrFlag.ssr = true;
-    if (!routerWithSsrFlag.ssr) {
-        throw new Error('react-on-rails-pro/tanstack-router: Expected router.ssr to accept a boolean flag. ' +
-            'Please check that your @tanstack/react-router version is compatible.');
-    }
-}
 /**
  * Builds a React element tree with RouterProvider and optional AppWrapper.
  */
@@ -80,9 +69,10 @@ export async function serverRenderTanStackAppAsync(options, props, railsContext,
     const memoryHistory = createMemoryHistory({ initialEntries: [url] });
     router.update({ history: memoryHistory });
     // Async path uses router.load() public API, so no private store access is needed.
+    // No router.ssr flag is set here: React effects (including Transitioner's auto-load)
+    // do not execute during server-side renderToString, and router.dehydrate() does not
+    // depend on router.ssr.
     await router.load();
-    // Ensure SSR output avoids client-only Suspense wrappers that can cause hydration mismatch.
-    enableRouterSsrMode(router);
     const dehydratedState = {
         url,
         dehydratedRouter: typeof router.dehydrate === 'function' ? router.dehydrate() : null,

package/lib/tanstack-router/types.d.ts

@@ -23,8 +23,8 @@ export interface TanStackRouter {
     };
     dehydrate?: () => unknown;
     hydrate?: (data: unknown) => void;
-    ssr?: boolean | {
-        manifest: unknown;
+    ssr?: {
+        manifest?: unknown;
     };
 }
 export interface TanStackHistory {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-on-rails-pro",
-  "version": "16.5.1",
+  "version": "16.6.0-rc.0",
   "description": "React on Rails Pro package with React Server Components support",
   "main": "lib/ReactOnRails.full.js",
   "type": "module",
@@ -47,7 +47,7 @@
     "./ServerComponentFetchError": "./lib/ServerComponentFetchError.js"
   },
   "dependencies": {
-    "react-on-rails": "16.5.1"
+    "react-on-rails": "16.6.0-rc.0"
   },
   "peerDependencies": {
     "react": ">= 16",