@bleedingdev/modern-js-plugin-tanstack 3.9.0-ultramodern.12 → 3.9.0-ultramodern.14

package/dist/cjs/runtime/plugin.node.js

@@ -129,7 +129,7 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                     disposed = true;
                     rawRequest.signal.removeEventListener('abort', onAbort);
                     controller.abort();
-                    serverRouter.serverSsr?.cleanup?.();
+                    serverRouter.serverSsr?.cleanup();
                 };
                 (0, external_lifecycle_js_namespaceObject.applyRouterRuntimeState)(context, {
                     framework: 'tanstack',
@@ -167,15 +167,15 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                     }
                     await (0, external_ssrPreload_js_namespaceObject.preloadMatchedRouteComponents)(serverRouter);
                     context.ssrContext?.response?.status(serverLoadResult.status);
-                    await serverRouter.serverSsr?.dehydrate?.();
-                    if (enableRsc) {
-                        if (isRSCNavigation) await (0, external_ssrManagedTags_js_namespaceObject.waitForRouterSerialization)(serverRouter);
-                        (0, payloadStorage_js_namespaceObject.setTanstackRscServerPayload)((0, payloadRouter_js_namespaceObject.createTanstackRscServerPayload)(serverRouter, {
-                            omitClientLoaderData: isRSCNavigation
-                        }));
-                    }
-                    const ssrScriptTags = serverRouter.serverSsr?.takeBufferedScripts?.();
-                    const hydrationScripts = (0, external_ssrManagedTags_js_namespaceObject.routerManagedTagsToHtml)(ssrScriptTags);
+                    await serverRouter.serverSsr?.dehydrate();
+                    if (enableRsc) (0, payloadStorage_js_namespaceObject.setTanstackRscServerPayload)((0, payloadRouter_js_namespaceObject.createTanstackRscServerPayload)(serverRouter, {
+                        omitClientLoaderData: isRSCNavigation
+                    }));
+                    const initialScriptTags = serverRouter.serverSsr?.takeInitialHydrationScriptTags();
+                    const hydrationScripts = initialScriptTags ? (0, external_ssrManagedTags_js_namespaceObject.routerManagedTagsToHtml)([
+                        ...initialScriptTags.before,
+                        initialScriptTags.boundary
+                    ]) : [];
                     const matchedRouteIds = (0, index_js_namespaceObject.getModernRouteIdsFromMatches)(serverRouter);
                     const routerServerSnapshot = {
                         framework: 'tanstack',

package/dist/cjs/runtime/ssrManagedTags.js

@@ -27,13 +27,6 @@ var __webpack_require__ = {};
 })();
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
-async function waitForRouterSerialization(tanstackRouter) {
-    const serverSsr = tanstackRouter.serverSsr;
-    if (!serverSsr || 'function' != typeof serverSsr.onSerializationFinished || serverSsr.isSerializationFinished?.()) return;
-    await new Promise((resolve)=>{
-        serverSsr.onSerializationFinished?.(resolve);
-    });
-}
 function htmlEscapeAttr(value) {
     return value.replace(/&/g, '&').replace(/"/g, '"');
 }
@@ -83,20 +76,17 @@ __webpack_require__.d(__webpack_exports__, {
     attachServerSsrUtils: ()=>attachServerSsrUtils,
     collectRouterErrors: ()=>collectRouterErrors,
     createGetSsrHref: ()=>createGetSsrHref,
-    routerManagedTagsToHtml: ()=>routerManagedTagsToHtml,
-    waitForRouterSerialization: ()=>waitForRouterSerialization
+    routerManagedTagsToHtml: ()=>routerManagedTagsToHtml
 });
 exports.attachServerSsrUtils = __webpack_exports__.attachServerSsrUtils;
 exports.collectRouterErrors = __webpack_exports__.collectRouterErrors;
 exports.createGetSsrHref = __webpack_exports__.createGetSsrHref;
 exports.routerManagedTagsToHtml = __webpack_exports__.routerManagedTagsToHtml;
-exports.waitForRouterSerialization = __webpack_exports__.waitForRouterSerialization;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "attachServerSsrUtils",
     "collectRouterErrors",
     "createGetSsrHref",
-    "routerManagedTagsToHtml",
-    "waitForRouterSerialization"
+    "routerManagedTagsToHtml"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/dist/esm/cli/index.mjs

@@ -2,19 +2,13 @@ import node_path from "node:path";
 import { NESTED_ROUTE_SPEC_FILE, filterRoutesForServer } from "@modern-js/utils";
 import { generateTanstackRouteArtifacts, writeTanstackRegisterFile, writeTanstackRouterTypesForEntries } from "./artifacts.mjs";
 import { createTanstackRsbuildRouteSplittingProfile, resolveTanstackRouteCodeSplittingEnabled } from "./routeSplitting.mjs";
-import { __webpack_require__ } from "../rslib-runtime~1.mjs";
-__webpack_require__.add({
-    267 (module) {
-        module.exports = require("@modern-js/runtime/cli");
-    }
-});
 const DEFAULT_ROUTES_DIR = 'routes';
 const DEFAULT_GENERATED_DIR_NAME = 'modern-tanstack';
 const ENTRYPOINTS_KEY = '@modern-js/plugin-tanstack';
 let runtimeRouterCli;
 function getRuntimeRouterCli() {
     if (runtimeRouterCli) return runtimeRouterCli;
-    const cli = __webpack_require__(267);
+    const cli = require("@modern-js/runtime/cli");
     if (cli.handleGeneratorEntryCode && cli.getEntrypointRoutesDir && cli.getEntrypointRoutesOwner && cli.updateNestedRoutesSpec) {
         runtimeRouterCli = cli;
         return runtimeRouterCli;

package/dist/esm/runtime/plugin.node.mjs

@@ -15,7 +15,7 @@ import { Link } from "./prefetchLink.mjs";
 import { createRouteTreeFromRouteObjects, getModernRouteIdsFromMatches } from "./routeTree/index.mjs";
 import { createTanstackRscServerPayload, handleTanstackRscRedirect } from "./rsc/payloadRouter.mjs";
 import { getTanstackRscRouter, setTanstackRscRouter, setTanstackRscServerPayload } from "./rsc/payloadStorage.mjs";
-import { attachServerSsrUtils, collectRouterErrors, createGetSsrHref, routerManagedTagsToHtml, waitForRouterSerialization } from "./ssrManagedTags.mjs";
+import { attachServerSsrUtils, collectRouterErrors, createGetSsrHref, routerManagedTagsToHtml } from "./ssrManagedTags.mjs";
 import { preloadMatchedRouteComponents } from "./ssrPreload.mjs";
 import { getModernTanstackRouterFastDefaults } from "./types.mjs";
 const tanstackRouterPlugin = (userConfig = {})=>{
@@ -96,7 +96,7 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                     disposed = true;
                     rawRequest.signal.removeEventListener('abort', onAbort);
                     controller.abort();
-                    serverRouter.serverSsr?.cleanup?.();
+                    serverRouter.serverSsr?.cleanup();
                 };
                 applyRouterRuntimeState(context, {
                     framework: 'tanstack',
@@ -134,15 +134,15 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                     }
                     await preloadMatchedRouteComponents(serverRouter);
                     context.ssrContext?.response?.status(serverLoadResult.status);
-                    await serverRouter.serverSsr?.dehydrate?.();
-                    if (enableRsc) {
-                        if (isRSCNavigation) await waitForRouterSerialization(serverRouter);
-                        setTanstackRscServerPayload(createTanstackRscServerPayload(serverRouter, {
-                            omitClientLoaderData: isRSCNavigation
-                        }));
-                    }
-                    const ssrScriptTags = serverRouter.serverSsr?.takeBufferedScripts?.();
-                    const hydrationScripts = routerManagedTagsToHtml(ssrScriptTags);
+                    await serverRouter.serverSsr?.dehydrate();
+                    if (enableRsc) setTanstackRscServerPayload(createTanstackRscServerPayload(serverRouter, {
+                        omitClientLoaderData: isRSCNavigation
+                    }));
+                    const initialScriptTags = serverRouter.serverSsr?.takeInitialHydrationScriptTags();
+                    const hydrationScripts = initialScriptTags ? routerManagedTagsToHtml([
+                        ...initialScriptTags.before,
+                        initialScriptTags.boundary
+                    ]) : [];
                     const matchedRouteIds = getModernRouteIdsFromMatches(serverRouter);
                     const routerServerSnapshot = {
                         framework: 'tanstack',

package/dist/esm/runtime/ssrManagedTags.mjs

@@ -1,10 +1,3 @@
-async function waitForRouterSerialization(tanstackRouter) {
-    const serverSsr = tanstackRouter.serverSsr;
-    if (!serverSsr || 'function' != typeof serverSsr.onSerializationFinished || serverSsr.isSerializationFinished?.()) return;
-    await new Promise((resolve)=>{
-        serverSsr.onSerializationFinished?.(resolve);
-    });
-}
 function htmlEscapeAttr(value) {
     return value.replace(/&/g, '&').replace(/"/g, '"');
 }
@@ -50,4 +43,4 @@ async function attachServerSsrUtils(router) {
         manifest: void 0
     });
 }
-export { attachServerSsrUtils, collectRouterErrors, createGetSsrHref, routerManagedTagsToHtml, waitForRouterSerialization };
+export { attachServerSsrUtils, collectRouterErrors, createGetSsrHref, routerManagedTagsToHtml };

package/dist/esm-node/cli/index.mjs

@@ -3,24 +3,18 @@ import node_path from "node:path";
 import { NESTED_ROUTE_SPEC_FILE, filterRoutesForServer } from "@modern-js/utils";
 import { generateTanstackRouteArtifacts, writeTanstackRegisterFile, writeTanstackRouterTypesForEntries } from "./artifacts.mjs";
 import { createTanstackRsbuildRouteSplittingProfile, resolveTanstackRouteCodeSplittingEnabled } from "./routeSplitting.mjs";
-import { __webpack_require__ } from "../rslib-runtime~0.mjs";
 import { fileURLToPath as __rspack_fileURLToPath } from "node:url";
 import { dirname as __rspack_dirname } from "node:path";
 var __rspack_import_meta_dirname__ = __rspack_dirname(__rspack_fileURLToPath(import.meta.url));
 import { createRequire as __rspack_createRequire } from "node:module";
 const __rspack_createRequire_require = __rspack_createRequire(import.meta.url);
-__webpack_require__.add({
-    "@modern-js/runtime/cli?667f" (module) {
-        module.exports = __rspack_createRequire_require("@modern-js/runtime/cli");
-    }
-});
 const DEFAULT_ROUTES_DIR = 'routes';
 const DEFAULT_GENERATED_DIR_NAME = 'modern-tanstack';
 const ENTRYPOINTS_KEY = '@modern-js/plugin-tanstack';
 let runtimeRouterCli;
 function getRuntimeRouterCli() {
     if (runtimeRouterCli) return runtimeRouterCli;
-    const cli = __webpack_require__("@modern-js/runtime/cli?667f");
+    const cli = __rspack_createRequire_require("@modern-js/runtime/cli");
     if (cli.handleGeneratorEntryCode && cli.getEntrypointRoutesDir && cli.getEntrypointRoutesOwner && cli.updateNestedRoutesSpec) {
         runtimeRouterCli = cli;
         return runtimeRouterCli;

package/dist/esm-node/runtime/plugin.node.mjs

@@ -16,7 +16,7 @@ import { Link } from "./prefetchLink.mjs";
 import { createRouteTreeFromRouteObjects, getModernRouteIdsFromMatches } from "./routeTree/index.mjs";
 import { createTanstackRscServerPayload, handleTanstackRscRedirect } from "./rsc/payloadRouter.mjs";
 import { getTanstackRscRouter, setTanstackRscRouter, setTanstackRscServerPayload } from "./rsc/payloadStorage.mjs";
-import { attachServerSsrUtils, collectRouterErrors, createGetSsrHref, routerManagedTagsToHtml, waitForRouterSerialization } from "./ssrManagedTags.mjs";
+import { attachServerSsrUtils, collectRouterErrors, createGetSsrHref, routerManagedTagsToHtml } from "./ssrManagedTags.mjs";
 import { preloadMatchedRouteComponents } from "./ssrPreload.mjs";
 import { getModernTanstackRouterFastDefaults } from "./types.mjs";
 const tanstackRouterPlugin = (userConfig = {})=>{
@@ -97,7 +97,7 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                     disposed = true;
                     rawRequest.signal.removeEventListener('abort', onAbort);
                     controller.abort();
-                    serverRouter.serverSsr?.cleanup?.();
+                    serverRouter.serverSsr?.cleanup();
                 };
                 applyRouterRuntimeState(context, {
                     framework: 'tanstack',
@@ -135,15 +135,15 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                     }
                     await preloadMatchedRouteComponents(serverRouter);
                     context.ssrContext?.response?.status(serverLoadResult.status);
-                    await serverRouter.serverSsr?.dehydrate?.();
-                    if (enableRsc) {
-                        if (isRSCNavigation) await waitForRouterSerialization(serverRouter);
-                        setTanstackRscServerPayload(createTanstackRscServerPayload(serverRouter, {
-                            omitClientLoaderData: isRSCNavigation
-                        }));
-                    }
-                    const ssrScriptTags = serverRouter.serverSsr?.takeBufferedScripts?.();
-                    const hydrationScripts = routerManagedTagsToHtml(ssrScriptTags);
+                    await serverRouter.serverSsr?.dehydrate();
+                    if (enableRsc) setTanstackRscServerPayload(createTanstackRscServerPayload(serverRouter, {
+                        omitClientLoaderData: isRSCNavigation
+                    }));
+                    const initialScriptTags = serverRouter.serverSsr?.takeInitialHydrationScriptTags();
+                    const hydrationScripts = initialScriptTags ? routerManagedTagsToHtml([
+                        ...initialScriptTags.before,
+                        initialScriptTags.boundary
+                    ]) : [];
                     const matchedRouteIds = getModernRouteIdsFromMatches(serverRouter);
                     const routerServerSnapshot = {
                         framework: 'tanstack',

package/dist/esm-node/runtime/ssrManagedTags.mjs

@@ -1,11 +1,4 @@
 import "node:module";
-async function waitForRouterSerialization(tanstackRouter) {
-    const serverSsr = tanstackRouter.serverSsr;
-    if (!serverSsr || 'function' != typeof serverSsr.onSerializationFinished || serverSsr.isSerializationFinished?.()) return;
-    await new Promise((resolve)=>{
-        serverSsr.onSerializationFinished?.(resolve);
-    });
-}
 function htmlEscapeAttr(value) {
     return value.replace(/&/g, '&').replace(/"/g, '"');
 }
@@ -51,4 +44,4 @@ async function attachServerSsrUtils(router) {
         manifest: void 0
     });
 }
-export { attachServerSsrUtils, collectRouterErrors, createGetSsrHref, routerManagedTagsToHtml, waitForRouterSerialization };
+export { attachServerSsrUtils, collectRouterErrors, createGetSsrHref, routerManagedTagsToHtml };

package/dist/types/runtime/ssrManagedTags.d.ts

@@ -1,6 +1,5 @@
 import type { AnyRouter } from '@tanstack/react-router';
 import type { TanstackRouterWithServerSsr } from './ssrTypes.js';
-export declare function waitForRouterSerialization(tanstackRouter: TanstackRouterWithServerSsr): Promise<void>;
 export declare function routerManagedTagsToHtml(tags: unknown): string[];
 export declare function createGetSsrHref(request: Request): string;
 export declare function collectRouterErrors(tanstackRouter: AnyRouter): Record<string, unknown> | undefined;

package/dist/types/runtime/ssrTypes.d.ts

@@ -28,13 +28,6 @@ type RouterRouteWithOptions = {
 };
 export type TanstackRouterWithServerSsr = AnyRouter & {
     routesById?: Record<string, RouterRouteWithOptions>;
-    serverSsr?: {
-        cleanup?: () => void;
-        dehydrate?: () => Promise<void> | void;
-        isSerializationFinished?: () => boolean;
-        onSerializationFinished?: (listener: () => void) => void;
-        takeBufferedScripts?: () => unknown;
-    };
     state: AnyRouter['state'] & {
         matches?: unknown;
     };

package/package.json

@@ -18,7 +18,7 @@
     "modern.js",
     "tanstack-router"
   ],
-  "version": "3.9.0-ultramodern.12",
+  "version": "3.9.0-ultramodern.14",
   "engines": {
     "node": ">=20"
   },
@@ -94,19 +94,19 @@
     }
   },
   "dependencies": {
-    "@modern-js/i18n-runtime-extensions": "npm:@bleedingdev/modern-js-i18n-runtime-extensions@3.9.0-ultramodern.12",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.12",
-    "@modern-js/runtime-extensions": "npm:@bleedingdev/modern-js-runtime-extensions@3.9.0-ultramodern.12",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.12",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.12",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.12",
+    "@modern-js/i18n-runtime-extensions": "npm:@bleedingdev/modern-js-i18n-runtime-extensions@3.9.0-ultramodern.14",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.14",
+    "@modern-js/runtime-extensions": "npm:@bleedingdev/modern-js-runtime-extensions@3.9.0-ultramodern.14",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.14",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.14",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.14",
     "@swc/helpers": "^0.5.23",
-    "@tanstack/react-router": "1.170.33",
-    "@tanstack/router-core": "1.171.28"
+    "@tanstack/react-router": "1.170.39",
+    "@tanstack/router-core": "1.171.32"
   },
   "peerDependencies": {
-    "@modern-js/app-tools": "3.9.0-ultramodern.12",
-    "@modern-js/runtime": "3.9.0-ultramodern.12",
+    "@modern-js/app-tools": "3.9.0-ultramodern.14",
+    "@modern-js/runtime": "3.9.0-ultramodern.14",
     "react": "^19.2.8",
     "react-dom": "^19.2.8",
     "react-server-dom-rspack": "0.1.0"
@@ -117,20 +117,20 @@
     }
   },
   "devDependencies": {
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.9.0-ultramodern.12",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.9.0-ultramodern.12",
-    "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.9.0-ultramodern.12",
-    "@rslib/core": "1.0.0",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.9.0-ultramodern.14",
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.9.0-ultramodern.14",
+    "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.9.0-ultramodern.14",
+    "@rslib/core": "1.0.2",
     "@scripts/rstest-config": "2.66.0",
-    "@tanstack/history": "1.162.2",
+    "@tanstack/history": "1.162.4",
     "@testing-library/react": "^16.3.3",
     "@tsconfig/strictest": "2.0.8",
-    "@types/node": "^26.4.1",
-    "@types/react": "^19.2.18",
-    "@types/react-dom": "^19.2.7",
+    "@types/node": "^26.6.2",
+    "@types/react": "^19.3.0",
+    "@types/react-dom": "^19.3.0",
     "@typescript/native-preview": "7.0.0-dev.20260707.2",
-    "react": "^19.2.8",
-    "react-dom": "^19.2.8",
+    "react": "^19.3.0",
+    "react-dom": "^19.3.0",
     "react-server-dom-rspack": "0.1.0"
   },
   "sideEffects": [

package/src/runtime/plugin.node.tsx

@@ -56,7 +56,6 @@ import {
   collectRouterErrors,
   createGetSsrHref,
   routerManagedTagsToHtml,
-  waitForRouterSerialization,
 } from './ssrManagedTags';
 import { preloadMatchedRouteComponents } from './ssrPreload';
 import type {
@@ -178,7 +177,7 @@ export const tanstackRouterPlugin = (
           disposed = true;
           rawRequest.signal.removeEventListener('abort', onAbort);
           controller.abort();
-          serverRouter.serverSsr?.cleanup?.();
+          serverRouter.serverSsr?.cleanup();
         };
         // Acquire the disposer before attachment: every subsequent failure,
         // including partial attachment, has an owner. Successful preparation
@@ -244,16 +243,9 @@ export const tanstackRouterPlugin = (
               | undefined
           )?.status(serverLoadResult.status);
 
-          await serverRouter.serverSsr?.dehydrate?.();
+          await serverRouter.serverSsr?.dehydrate();
 
           if (enableRsc) {
-            if (isRSCNavigation) {
-              // RSC navigations consume the server payload directly. Normal HTML SSR
-              // emits the buffered bootstrap script below and must not wait here
-              // because Modern's non-streaming hook has not rendered the app yet.
-              await waitForRouterSerialization(serverRouter);
-            }
-
             setTanstackRscServerPayload(
               createTanstackRscServerPayload(serverRouter, {
                 omitClientLoaderData: isRSCNavigation,
@@ -261,8 +253,14 @@ export const tanstackRouterPlugin = (
             );
           }
 
-          const ssrScriptTags = serverRouter.serverSsr?.takeBufferedScripts?.();
-          const hydrationScripts = routerManagedTagsToHtml(ssrScriptTags);
+          const initialScriptTags =
+            serverRouter.serverSsr?.takeInitialHydrationScriptTags();
+          const hydrationScripts = initialScriptTags
+            ? routerManagedTagsToHtml([
+                ...initialScriptTags.before,
+                initialScriptTags.boundary,
+              ])
+            : [];
           const matchedRouteIds = getModernRouteIdsFromMatches(serverRouter);
           const routerServerSnapshot: InternalRouterServerSnapshot = {
             framework: 'tanstack',

package/src/runtime/ssrManagedTags.ts

@@ -6,23 +6,6 @@ import type {
   TanstackRouterWithServerSsr,
 } from './ssrTypes';
 
-export async function waitForRouterSerialization(
-  tanstackRouter: TanstackRouterWithServerSsr,
-) {
-  const serverSsr = tanstackRouter.serverSsr;
-  if (
-    !serverSsr ||
-    typeof serverSsr.onSerializationFinished !== 'function' ||
-    serverSsr.isSerializationFinished?.()
-  ) {
-    return;
-  }
-
-  await new Promise<void>(resolve => {
-    serverSsr.onSerializationFinished?.(resolve);
-  });
-}
-
 function htmlEscapeAttr(value: string) {
   return value.replace(/&/g, '&amp;').replace(/"/g, '&quot;');
 }

package/src/runtime/ssrTypes.ts

@@ -34,13 +34,6 @@ type RouterRouteWithOptions = {
 
 export type TanstackRouterWithServerSsr = AnyRouter & {
   routesById?: Record<string, RouterRouteWithOptions>;
-  serverSsr?: {
-    cleanup?: () => void;
-    dehydrate?: () => Promise<void> | void;
-    isSerializationFinished?: () => boolean;
-    onSerializationFinished?: (listener: () => void) => void;
-    takeBufferedScripts?: () => unknown;
-  };
   state: AnyRouter['state'] & {
     matches?: unknown;
   };

package/tests/router/clientNavigation.ts

@@ -0,0 +1,13 @@
+import type { AnyRouter } from '@tanstack/react-router';
+
+// Router-core navigates only on the client. Node tests perform the same
+// transition a mounted RouterProvider runs: push the rewritten public URL,
+// then load it.
+export async function navigateOnClient(
+  router: AnyRouter,
+  options: Parameters<AnyRouter['buildLocation']>[0],
+) {
+  router.history.push(router.buildLocation(options).publicHref);
+  router.updateLatestLocation();
+  await router.load();
+}

package/tests/router/localisedIdentity.test.tsx

@@ -12,6 +12,7 @@ import { renderToString } from 'react-dom/server';
 import { createModernBasepathRewrite } from '../../src/runtime/basepathRewrite';
 import { createRouteTreeFromRouteObjects } from '../../src/runtime/routeTree';
 import { createTanstackRouteObjectsFromConfig } from '../../src/runtime/utils';
+import { navigateOnClient } from './clientNavigation';
 
 function SearchPage() {
   const data = useLoaderData({ from: '/$lang/search' }) as { language: string };
@@ -80,14 +81,17 @@ test('localized URLs preserve native loader and params route identity in SSR and
   );
   expect(history.location.href).toBe('/base/cs/hledat?q=tractor#results');
 
-  await router.navigate({ to: '/en/search', search: { q: 'tractor' } });
+  await navigateOnClient(router, {
+    to: '/en/search',
+    search: { q: 'tractor' },
+  });
   expect(history.location.href).toBe('/base/en/find?q=tractor');
   expect(router.state.matches.at(-1)?.routeId).toBe('/$lang/search');
   expect(renderToString(createElement(RouterProvider, { router }))).toContain(
     'search:en',
   );
 
-  await router.navigate({ to: '/cs/zdroje/a%2Fb' });
+  await navigateOnClient(router, { to: '/cs/zdroje/a%2Fb' });
   expect(history.location.href).toBe('/base/cs/zdroje/a%2Fb');
   expect(router.state.matches.at(-1)?.routeId).toBe('/$lang/resources/$id');
   expect(renderToString(createElement(RouterProvider, { router }))).toContain(

package/tests/router/routeHooks.test.ts

@@ -8,6 +8,7 @@ import {
 import React from 'react';
 import { renderToString } from 'react-dom/server';
 import { useMatches } from '../../src/runtime/routeHooks';
+import { navigateOnClient } from './clientNavigation';
 
 function MatchIds() {
   const matches = useMatches();
@@ -41,7 +42,7 @@ test('updates whole match objects after navigation with the structural-sharing g
     renderToString(React.createElement(RouterProvider, { router })),
   ).toContain('__root__');
 
-  await router.navigate({ to: '/settings' });
+  await navigateOnClient(router, { to: '/settings' });
 
   expect(
     renderToString(React.createElement(RouterProvider, { router })),

package/tests/router/serverPlugin.test.ts

@@ -118,6 +118,11 @@ describe('tanstack server plugin router results', () => {
       framework: 'tanstack',
       statusCode: 200,
     });
+    // Without the dehydrated router the client re-renders matched remotes
+    // from scratch instead of hydrating the server HTML.
+    expect(getRouterServerSnapshot(context)?.hydrationScripts).toEqual(
+      expect.arrayContaining([expect.stringContaining('$_TSR')]),
+    );
   });
 
   test('interrupts SSR with the router redirect response', async () => {

package/tests/router/tanstackTypes.test.ts

@@ -14,6 +14,7 @@ import {
 import { createModernBasepathRewrite } from '../../src/runtime/basepathRewrite';
 import { createRouteTreeFromRouteObjects } from '../../src/runtime/routeTree';
 import { createTanstackRouteObjectsFromConfig } from '../../src/runtime/utils';
+import { navigateOnClient } from './clientNavigation';
 
 const execFileAsync = promisify(execFile);
 const strictestTsconfigPath = path.resolve(
@@ -330,7 +331,7 @@ describe('tanstack router type generation', () => {
       import { router } from ${JSON.stringify(pathToFileURL(generated).href)};
       import { createModernBasepathRewrite } from ${JSON.stringify(pathToFileURL(path.resolve(__dirname, '../../dist/esm/runtime/basepathRewrite.mjs')).href)};
       router.update({ rewrite: createModernBasepathRewrite('/base', false, ${JSON.stringify(routes)}) });
-      await router.navigate({ to: '/cs/produkty/a/b', search: { q: 'tractor' }, hash: 'files' });
+      router.history.push(router.buildLocation({ to: '/cs/produkty/a/b', search: { q: 'tractor' }, hash: 'files' }).publicHref); router.updateLatestLocation(); await router.load();
       console.log(JSON.stringify({ ids: Object.keys(router.routesById).sort(), match: router.state.matches.at(-1).routeId, params: router.state.matches.at(-1).params, href: router.history.location.href }));
     `,
     ]);
@@ -356,13 +357,13 @@ describe('tanstack router type generation', () => {
       lang: 'cs',
       _splat: 'a/b',
     });
-    await runtime.navigate({ to: '/cs/missing/path' });
+    await navigateOnClient(runtime, { to: '/cs/missing/path' });
     expect(runtime.state.matches.at(-1)?.routeId).toBe('/$lang/$');
     expect(runtime.state.matches.at(-1)?.params).toMatchObject({
       lang: 'cs',
       _splat: 'missing/path',
     });
-    await runtime.navigate({ to: '/outside/cs' });
+    await navigateOnClient(runtime, { to: '/outside/cs' });
     expect(runtime.state.matches.at(-1)?.params).toEqual({ lang: 'cs' });
     const canonicalRoutes = collectCanonicalRoutesForEntry(localized as any)!;
     expect(Object.keys(canonicalRoutes)).toEqual(['/$', '/products/$']);

package/dist/esm/rslib-runtime~1.mjs

@@ -1,18 +0,0 @@
-var __webpack_modules__ = {};
-var __webpack_module_cache__ = {};
-function __webpack_require__(moduleId) {
-    var cachedModule = __webpack_module_cache__[moduleId];
-    if (void 0 !== cachedModule) return cachedModule.exports;
-    var module = __webpack_module_cache__[moduleId] = {
-        exports: {}
-    };
-    __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
-    return module.exports;
-}
-__webpack_require__.m = __webpack_modules__;
-(()=>{
-    __webpack_require__.add = function(modules) {
-        Object.assign(__webpack_require__.m, modules);
-    };
-})();
-export { __webpack_require__ };

package/dist/esm-node/rslib-runtime~0.mjs

@@ -1,19 +0,0 @@
-import "node:module";
-var __webpack_modules__ = {};
-var __webpack_module_cache__ = {};
-function __webpack_require__(moduleId) {
-    var cachedModule = __webpack_module_cache__[moduleId];
-    if (void 0 !== cachedModule) return cachedModule.exports;
-    var module = __webpack_module_cache__[moduleId] = {
-        exports: {}
-    };
-    __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
-    return module.exports;
-}
-__webpack_require__.m = __webpack_modules__;
-(()=>{
-    __webpack_require__.add = function(modules) {
-        Object.assign(__webpack_require__.m, modules);
-    };
-})();
-export { __webpack_require__ };