@bleedingdev/modern-js-plugin-tanstack 3.5.0-ultramodern.102 → 3.5.0-ultramodern.103

package/dist/cjs/cli/index.js

@@ -171,6 +171,8 @@ var __webpack_exports__ = {};
                     const routesByEntry = await handleGeneratorEntryCode(api, tanstackEntrypoints, {
                         entrypointsKey: ENTRYPOINTS_KEY,
                         hydrateRscClientRoutes: true,
+                        includeRouteServerLoadersInSsrEntry: false,
+                        isolateRouteDataInRscLayer: true,
                         serverRoutesFileName: 'tanstack-routes.server.js'
                     });
                     await (0, external_artifacts_js_namespaceObject.writeTanstackRouterTypesForEntries)({
@@ -193,6 +195,8 @@ var __webpack_exports__ = {};
                             const routesByEntry = await handleGeneratorEntryCode(api, entrypoints, {
                                 entrypointsKey: ENTRYPOINTS_KEY,
                                 hydrateRscClientRoutes: true,
+                                includeRouteServerLoadersInSsrEntry: false,
+                                isolateRouteDataInRscLayer: true,
                                 serverRoutesFileName: 'tanstack-routes.server.js'
                             });
                             await (0, external_artifacts_js_namespaceObject.writeTanstackRouterTypesForEntries)({

package/dist/cjs/cli/tanstackTypes/source.js

@@ -1,14 +1,5 @@
 "use strict";
 var __webpack_require__ = {};
-(()=>{
-    __webpack_require__.n = (module)=>{
-        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
-        __webpack_require__.d(getter, {
-            a: getter
-        });
-        return getter;
-    };
-})();
 (()=>{
     __webpack_require__.d = (exports1, getters, values)=>{
         var define = (defs, kind)=>{
@@ -39,13 +30,12 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     generateTanstackRouterTypesSourceForEntry: ()=>generateTanstackRouterTypesSourceForEntry
 });
-const external_node_path_namespaceObject = require("node:path");
-var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
 const cli_namespaceObject = require("@modern-js/runtime/cli");
+const utils_namespaceObject = require("@modern-js/utils");
 const external_shared_js_namespaceObject = require("./shared.js");
 async function generateTanstackRouterTypesSourceForEntry(opts) {
     const { appContext, entryName, generatedDirName = 'modern-tanstack', routes } = opts;
-    const outDir = external_node_path_default().join(appContext.srcDirectory, generatedDirName, entryName);
+    const outDir = utils_namespaceObject.upath.join(appContext.srcDirectory, generatedDirName, entryName);
     const rootModern = routes.find((r)=>{
         const extras = r;
         return r && 'nested' === extras.type && extras.isRoot;
@@ -70,7 +60,7 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
             pendingImportName = (async ()=>{
                 const resolvedNoExt = await resolveRouteModuleNoExt(componentPath);
                 if (!resolvedNoExt) return null;
-                const relImport = (0, external_shared_js_namespaceObject.normalizeRelativeImport)(external_node_path_default().relative(outDir, resolvedNoExt));
+                const relImport = (0, external_shared_js_namespaceObject.normalizeRelativeImport)(utils_namespaceObject.upath.relative(outDir, resolvedNoExt));
                 const componentName = `component_${componentIndex++}`;
                 imports.push(`import ${componentName} from ${(0, external_shared_js_namespaceObject.quote)(relImport)};`);
                 return componentName;
@@ -84,8 +74,8 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         let absNoExt;
         if (aliasedNoExtPath.startsWith(prefix)) {
             const rel = aliasedNoExtPath.slice(prefix.length);
-            absNoExt = external_node_path_default().join(appContext.srcDirectory, rel);
-        } else absNoExt = external_node_path_default().isAbsolute(aliasedNoExtPath) ? aliasedNoExtPath : external_node_path_default().join(appContext.srcDirectory, aliasedNoExtPath);
+            absNoExt = utils_namespaceObject.upath.join(appContext.srcDirectory, rel);
+        } else absNoExt = utils_namespaceObject.upath.isAbsolute(aliasedNoExtPath) ? aliasedNoExtPath : utils_namespaceObject.upath.join(appContext.srcDirectory, aliasedNoExtPath);
         return (0, external_shared_js_namespaceObject.resolveFileNoExt)(absNoExt);
     };
     const getImportNamesForLoader = async (aliasedNoExtPath, inline, hasAction)=>{
@@ -97,7 +87,7 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         };
         const resolvedNoExt = await resolveRouteModuleNoExt(aliasedNoExtPath);
         if (!resolvedNoExt) return null;
-        const relImport = (0, external_shared_js_namespaceObject.normalizeRelativeImport)(external_node_path_default().relative(outDir, resolvedNoExt));
+        const relImport = (0, external_shared_js_namespaceObject.normalizeRelativeImport)(utils_namespaceObject.upath.relative(outDir, resolvedNoExt));
         const importName = `loader_${loaderIndex++}`;
         const actionName = hasAction ? importName.replace(/^loader_/, 'action_') : null;
         if (inline) {
@@ -119,7 +109,7 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         if (existing) return existing;
         const resolvedNoExt = await resolveRouteModuleNoExt(aliasedNoExtPath);
         if (!resolvedNoExt) return null;
-        const relImport = (0, external_shared_js_namespaceObject.normalizeRelativeImport)(external_node_path_default().relative(outDir, resolvedNoExt));
+        const relImport = (0, external_shared_js_namespaceObject.normalizeRelativeImport)(utils_namespaceObject.upath.relative(outDir, resolvedNoExt));
         const importName = 'validateSearch' === exportName ? `validateSearch_${validateSearchIndex++}` : `loaderDeps_${loaderDepsIndex++}`;
         imports.push(`import { ${exportName} as ${importName} } from ${(0, external_shared_js_namespaceObject.quote)(relImport)};`);
         searchContractImportMap.set(key, importName);

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

@@ -127,12 +127,19 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                     const cost = end();
                     context.ssrContext?.onTiming?.(constants_namespaceObject.LOADER_REPORTER_NAME, cost);
                 }
-                if (serverRouter.state.redirect) {
-                    const resolved = serverRouter.resolveRedirect ? serverRouter.resolveRedirect(serverRouter.state.redirect) : serverRouter.state.redirect;
+                const serverLoadResult = serverRouter._serverResult;
+                if (!serverLoadResult) {
                     try {
                         serverRouter.serverSsr?.cleanup?.();
                     } catch  {}
-                    return interrupt(isRSCNavigation ? (0, payloadRouter_js_namespaceObject.handleTanstackRscRedirect)(resolved.headers, _basename, resolved.status) : resolved);
+                    throw new Error('TanStack Router completed an SSR load without a server result.');
+                }
+                if ('redirect' === serverLoadResult.type) {
+                    const { redirect } = serverLoadResult;
+                    try {
+                        serverRouter.serverSsr?.cleanup?.();
+                    } catch  {}
+                    return interrupt(isRSCNavigation ? (0, payloadRouter_js_namespaceObject.handleTanstackRscRedirect)(redirect.headers, _basename, redirect.status) : redirect);
                 }
                 const routerErrors = (0, external_ssrManagedTags_js_namespaceObject.collectRouterErrors)(tanstackRouter);
                 if (routerErrors && 'clientRender' === loaderFailureMode) {
@@ -143,7 +150,7 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                     throw Object.values(routerErrors)[0];
                 }
                 await (0, external_ssrPreload_js_namespaceObject.preloadMatchedRouteComponents)(serverRouter);
-                context.ssrContext?.response?.status(tanstackRouter.state.statusCode);
+                context.ssrContext?.response?.status(serverLoadResult.status);
                 await serverRouter.serverSsr?.dehydrate?.();
                 if (enableRsc) {
                     if (isRSCNavigation) await (0, external_ssrManagedTags_js_namespaceObject.waitForRouterSerialization)(serverRouter);
@@ -157,7 +164,7 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                 const routerServerSnapshot = (0, external_lifecycle_js_namespaceObject.createRouterServerSnapshot)({
                     framework: 'tanstack',
                     basename: _basename,
-                    statusCode: tanstackRouter.state.statusCode,
+                    statusCode: serverLoadResult.status,
                     errors: routerErrors,
                     matchedRouteIds,
                     hydrationScripts

package/dist/cjs/runtime/pluginShared.js

@@ -58,10 +58,10 @@ function getTanstackRouteConfig(api, userConfig) {
 }
 function createTanstackRouteObjects({ hooks, routeConfig, ssrMode }) {
     const { mergedConfig, finalRouteConfig } = routeConfig;
-    const routeObjects = mergedConfig.createRoutes ? mergedConfig.createRoutes() : (0, external_utils_js_namespaceObject.createTanstackRouteObjectsFromConfig)({
+    const routeObjects = void 0 !== mergedConfig.createRoutes ? mergedConfig.createRoutes() : (0, external_utils_js_namespaceObject.createTanstackRouteObjectsFromConfig)({
         routesConfig: finalRouteConfig,
         ssrMode
-    }) || [];
+    }) ?? [];
     return hooks.modifyRoutes.call(routeObjects);
 }
 function joinBasename(baseUrl, basename) {
@@ -69,7 +69,7 @@ function joinBasename(baseUrl, basename) {
     const normalizedBase = base.startsWith('/') ? base : `/${base}`;
     const trimmedBase = normalizedBase.length > 1 ? normalizedBase.replace(/\/+$/g, '') : normalizedBase;
     const trimmedBasename = basename.replace(/^\/+|\/+$/g, '');
-    if (!trimmedBasename) return trimmedBase || '/';
+    if (0 === trimmedBasename.length) return trimmedBase || '/';
     return `${trimmedBase}/${trimmedBasename}`.replace(/\/{2,}/g, '/');
 }
 exports.createTanstackRouteObjects = __webpack_exports__.createTanstackRouteObjects;

package/dist/cjs/runtime/rsc/payloadErrors.js

@@ -34,12 +34,12 @@ __webpack_require__.d(__webpack_exports__, {
     toRouteErrors: ()=>toRouteErrors,
     toRouteLoaderData: ()=>toRouteLoaderData
 });
-const router_namespaceObject = require("@modern-js/runtime-utils/router");
+const routerHelper_namespaceObject = require("@modern-js/runtime/routerHelper");
 function shouldRedactServerError(status = 500) {
     return status >= 500 && 'development' !== process.env.NODE_ENV && 'test' !== process.env.NODE_ENV;
 }
 function serializePayloadError(error) {
-    if ((0, router_namespaceObject.isRouteErrorResponse)(error)) {
+    if ((0, routerHelper_namespaceObject.isRouteErrorResponse)(error)) {
         if (shouldRedactServerError(error.status)) return {
             status: error.status,
             statusText: 'Internal Server Error',

package/dist/cjs/runtime/rsc/shared.js

@@ -50,7 +50,7 @@ function selectTreePath(tree, path) {
     return current;
 }
 function renderSelectedTree(src, { getTree = src[external_symbols_js_namespaceObject.RSC_PROXY_GET_TREE], missingTreeError }) {
-    if (!getTree) throw new Error(missingTreeError);
+    if (void 0 === getTree) throw new Error(missingTreeError);
     return selectTreePath(getTree(), src[external_symbols_js_namespaceObject.RSC_PROXY_PATH] || []);
 }
 exports.EmptyFallback = __webpack_exports__.EmptyFallback;

package/dist/cjs/runtime/rsc/treeGetter.js

@@ -40,15 +40,11 @@ function loadModernRscClientRuntime() {
     });
     return modernRscClientRuntimePromise;
 }
-async function createFromFlightStream(stream) {
-    if ("u" < typeof window) {
-        const runtime = await import("react-server-dom-rspack/client.edge");
-        return runtime.createFromReadableStream(stream);
-    }
-    const runtime = await loadModernRscClientRuntime();
-    return runtime.createFromReadableStream(stream, {
-        callServer: runtime.callServer
-    });
+function createFromFlightStream(stream) {
+    if ("u" < typeof window) return import("react-server-dom-rspack/client.edge").then((runtime)=>runtime.createFromReadableStream(stream));
+    return loadModernRscClientRuntime().then((runtime)=>runtime.createFromReadableStream(stream, {
+            callServer: runtime.callServer
+        }));
 }
 function createTreeGetterFromFlightStream(stream) {
     let ready = false;

package/dist/cjs/runtime/submitAction.js

@@ -44,16 +44,15 @@ function resolveRouteHandlers(router, actionTo) {
     const builtLocation = router.buildLocation({
         to: actionTo
     });
-    const href = router.getParsedLocationHref(builtLocation);
-    const matchedRoutes = router.getMatchedRoutes(builtLocation.pathname);
-    const routeStaticData = matchedRoutes.foundRoute?.options?.staticData;
+    const [, routeParams, foundRoute] = router.getMatchedRoutes(builtLocation.pathname);
+    const routeStaticData = foundRoute?.options?.staticData;
     const action = routeStaticData?.modernRouteAction;
     const loader = routeStaticData?.modernRouteLoader;
     return {
         action,
         loader,
-        href,
-        params: matchedRoutes.routeParams || {}
+        href: builtLocation.href,
+        params: routeParams
     };
 }
 function isRedirectResponse(value) {

package/dist/esm/cli/index.mjs

@@ -112,6 +112,8 @@ function tanstackRouterPlugin(options = {}) {
                 const routesByEntry = await handleGeneratorEntryCode(api, tanstackEntrypoints, {
                     entrypointsKey: ENTRYPOINTS_KEY,
                     hydrateRscClientRoutes: true,
+                    includeRouteServerLoadersInSsrEntry: false,
+                    isolateRouteDataInRscLayer: true,
                     serverRoutesFileName: 'tanstack-routes.server.js'
                 });
                 await writeTanstackRouterTypesForEntries({
@@ -134,6 +136,8 @@ function tanstackRouterPlugin(options = {}) {
                         const routesByEntry = await handleGeneratorEntryCode(api, entrypoints, {
                             entrypointsKey: ENTRYPOINTS_KEY,
                             hydrateRscClientRoutes: true,
+                            includeRouteServerLoadersInSsrEntry: false,
+                            isolateRouteDataInRscLayer: true,
                             serverRoutesFileName: 'tanstack-routes.server.js'
                         });
                         await writeTanstackRouterTypesForEntries({

package/dist/esm/cli/tanstackTypes/source.mjs

@@ -1,9 +1,9 @@
-import node_path from "node:path";
 import { makeLegalIdentifier } from "@modern-js/runtime/cli";
+import { upath } from "@modern-js/utils";
 import { createRouteStaticDataSnippet, isIndexRoute, isPathlessLayout, normalizeRelativeImport, pickModernLoaderModule, pickRouteSearchContractModules, quote, resolveFileNoExt, toTanstackPath } from "./shared.mjs";
 async function generateTanstackRouterTypesSourceForEntry(opts) {
     const { appContext, entryName, generatedDirName = 'modern-tanstack', routes } = opts;
-    const outDir = node_path.join(appContext.srcDirectory, generatedDirName, entryName);
+    const outDir = upath.join(appContext.srcDirectory, generatedDirName, entryName);
     const rootModern = routes.find((r)=>{
         const extras = r;
         return r && 'nested' === extras.type && extras.isRoot;
@@ -28,7 +28,7 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
             pendingImportName = (async ()=>{
                 const resolvedNoExt = await resolveRouteModuleNoExt(componentPath);
                 if (!resolvedNoExt) return null;
-                const relImport = normalizeRelativeImport(node_path.relative(outDir, resolvedNoExt));
+                const relImport = normalizeRelativeImport(upath.relative(outDir, resolvedNoExt));
                 const componentName = `component_${componentIndex++}`;
                 imports.push(`import ${componentName} from ${quote(relImport)};`);
                 return componentName;
@@ -42,8 +42,8 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         let absNoExt;
         if (aliasedNoExtPath.startsWith(prefix)) {
             const rel = aliasedNoExtPath.slice(prefix.length);
-            absNoExt = node_path.join(appContext.srcDirectory, rel);
-        } else absNoExt = node_path.isAbsolute(aliasedNoExtPath) ? aliasedNoExtPath : node_path.join(appContext.srcDirectory, aliasedNoExtPath);
+            absNoExt = upath.join(appContext.srcDirectory, rel);
+        } else absNoExt = upath.isAbsolute(aliasedNoExtPath) ? aliasedNoExtPath : upath.join(appContext.srcDirectory, aliasedNoExtPath);
         return resolveFileNoExt(absNoExt);
     };
     const getImportNamesForLoader = async (aliasedNoExtPath, inline, hasAction)=>{
@@ -55,7 +55,7 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         };
         const resolvedNoExt = await resolveRouteModuleNoExt(aliasedNoExtPath);
         if (!resolvedNoExt) return null;
-        const relImport = normalizeRelativeImport(node_path.relative(outDir, resolvedNoExt));
+        const relImport = normalizeRelativeImport(upath.relative(outDir, resolvedNoExt));
         const importName = `loader_${loaderIndex++}`;
         const actionName = hasAction ? importName.replace(/^loader_/, 'action_') : null;
         if (inline) {
@@ -77,7 +77,7 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         if (existing) return existing;
         const resolvedNoExt = await resolveRouteModuleNoExt(aliasedNoExtPath);
         if (!resolvedNoExt) return null;
-        const relImport = normalizeRelativeImport(node_path.relative(outDir, resolvedNoExt));
+        const relImport = normalizeRelativeImport(upath.relative(outDir, resolvedNoExt));
         const importName = 'validateSearch' === exportName ? `validateSearch_${validateSearchIndex++}` : `loaderDeps_${loaderDepsIndex++}`;
         imports.push(`import { ${exportName} as ${importName} } from ${quote(relImport)};`);
         searchContractImportMap.set(key, importName);

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

@@ -94,12 +94,19 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                     const cost = end();
                     context.ssrContext?.onTiming?.(LOADER_REPORTER_NAME, cost);
                 }
-                if (serverRouter.state.redirect) {
-                    const resolved = serverRouter.resolveRedirect ? serverRouter.resolveRedirect(serverRouter.state.redirect) : serverRouter.state.redirect;
+                const serverLoadResult = serverRouter._serverResult;
+                if (!serverLoadResult) {
                     try {
                         serverRouter.serverSsr?.cleanup?.();
                     } catch  {}
-                    return interrupt(isRSCNavigation ? handleTanstackRscRedirect(resolved.headers, _basename, resolved.status) : resolved);
+                    throw new Error('TanStack Router completed an SSR load without a server result.');
+                }
+                if ('redirect' === serverLoadResult.type) {
+                    const { redirect } = serverLoadResult;
+                    try {
+                        serverRouter.serverSsr?.cleanup?.();
+                    } catch  {}
+                    return interrupt(isRSCNavigation ? handleTanstackRscRedirect(redirect.headers, _basename, redirect.status) : redirect);
                 }
                 const routerErrors = collectRouterErrors(tanstackRouter);
                 if (routerErrors && 'clientRender' === loaderFailureMode) {
@@ -110,7 +117,7 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                     throw Object.values(routerErrors)[0];
                 }
                 await preloadMatchedRouteComponents(serverRouter);
-                context.ssrContext?.response?.status(tanstackRouter.state.statusCode);
+                context.ssrContext?.response?.status(serverLoadResult.status);
                 await serverRouter.serverSsr?.dehydrate?.();
                 if (enableRsc) {
                     if (isRSCNavigation) await waitForRouterSerialization(serverRouter);
@@ -124,7 +131,7 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                 const routerServerSnapshot = createRouterServerSnapshot({
                     framework: 'tanstack',
                     basename: _basename,
-                    statusCode: tanstackRouter.state.statusCode,
+                    statusCode: serverLoadResult.status,
                     errors: routerErrors,
                     matchedRouteIds,
                     hydrationScripts

package/dist/esm/runtime/pluginShared.mjs

@@ -23,10 +23,10 @@ function getTanstackRouteConfig(api, userConfig) {
 }
 function createTanstackRouteObjects({ hooks, routeConfig, ssrMode }) {
     const { mergedConfig, finalRouteConfig } = routeConfig;
-    const routeObjects = mergedConfig.createRoutes ? mergedConfig.createRoutes() : createTanstackRouteObjectsFromConfig({
+    const routeObjects = void 0 !== mergedConfig.createRoutes ? mergedConfig.createRoutes() : createTanstackRouteObjectsFromConfig({
         routesConfig: finalRouteConfig,
         ssrMode
-    }) || [];
+    }) ?? [];
     return hooks.modifyRoutes.call(routeObjects);
 }
 function joinBasename(baseUrl, basename) {
@@ -34,7 +34,7 @@ function joinBasename(baseUrl, basename) {
     const normalizedBase = base.startsWith('/') ? base : `/${base}`;
     const trimmedBase = normalizedBase.length > 1 ? normalizedBase.replace(/\/+$/g, '') : normalizedBase;
     const trimmedBasename = basename.replace(/^\/+|\/+$/g, '');
-    if (!trimmedBasename) return trimmedBase || '/';
+    if (0 === trimmedBasename.length) return trimmedBase || '/';
     return `${trimmedBase}/${trimmedBasename}`.replace(/\/{2,}/g, '/');
 }
 export { createTanstackRouteObjects, getMergedRouterConfig, getTanstackRouteConfig, joinBasename };

package/dist/esm/runtime/rsc/payloadErrors.mjs

@@ -1,4 +1,4 @@
-import { isRouteErrorResponse } from "@modern-js/runtime-utils/router";
+import { isRouteErrorResponse } from "@modern-js/runtime/routerHelper";
 function shouldRedactServerError(status = 500) {
     return status >= 500 && 'development' !== process.env.NODE_ENV && 'test' !== process.env.NODE_ENV;
 }

package/dist/esm/runtime/rsc/shared.mjs

@@ -15,7 +15,7 @@ function selectTreePath(tree, path) {
     return current;
 }
 function renderSelectedTree(src, { getTree = src[RSC_PROXY_GET_TREE], missingTreeError }) {
-    if (!getTree) throw new Error(missingTreeError);
+    if (void 0 === getTree) throw new Error(missingTreeError);
     return selectTreePath(getTree(), src[RSC_PROXY_PATH] || []);
 }
 export { EmptyFallback, TANSTACK_RSC_FLIGHT_VALUE, isSerializedTanstackRscFlightValue, renderSelectedTree };

package/dist/esm/runtime/rsc/treeGetter.mjs

@@ -8,15 +8,11 @@ function loadModernRscClientRuntime() {
     });
     return modernRscClientRuntimePromise;
 }
-async function createFromFlightStream(stream) {
-    if ("u" < typeof window) {
-        const runtime = await import("react-server-dom-rspack/client.edge");
-        return runtime.createFromReadableStream(stream);
-    }
-    const runtime = await loadModernRscClientRuntime();
-    return runtime.createFromReadableStream(stream, {
-        callServer: runtime.callServer
-    });
+function createFromFlightStream(stream) {
+    if ("u" < typeof window) return import("react-server-dom-rspack/client.edge").then((runtime)=>runtime.createFromReadableStream(stream));
+    return loadModernRscClientRuntime().then((runtime)=>runtime.createFromReadableStream(stream, {
+            callServer: runtime.callServer
+        }));
 }
 function createTreeGetterFromFlightStream(stream) {
     let ready = false;

package/dist/esm/runtime/submitAction.mjs

@@ -11,16 +11,15 @@ function resolveRouteHandlers(router, actionTo) {
     const builtLocation = router.buildLocation({
         to: actionTo
     });
-    const href = router.getParsedLocationHref(builtLocation);
-    const matchedRoutes = router.getMatchedRoutes(builtLocation.pathname);
-    const routeStaticData = matchedRoutes.foundRoute?.options?.staticData;
+    const [, routeParams, foundRoute] = router.getMatchedRoutes(builtLocation.pathname);
+    const routeStaticData = foundRoute?.options?.staticData;
     const action = routeStaticData?.modernRouteAction;
     const loader = routeStaticData?.modernRouteLoader;
     return {
         action,
         loader,
-        href,
-        params: matchedRoutes.routeParams || {}
+        href: builtLocation.href,
+        params: routeParams
     };
 }
 function isRedirectResponse(value) {

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

@@ -116,6 +116,8 @@ function tanstackRouterPlugin(options = {}) {
                 const routesByEntry = await handleGeneratorEntryCode(api, tanstackEntrypoints, {
                     entrypointsKey: ENTRYPOINTS_KEY,
                     hydrateRscClientRoutes: true,
+                    includeRouteServerLoadersInSsrEntry: false,
+                    isolateRouteDataInRscLayer: true,
                     serverRoutesFileName: 'tanstack-routes.server.js'
                 });
                 await writeTanstackRouterTypesForEntries({
@@ -138,6 +140,8 @@ function tanstackRouterPlugin(options = {}) {
                         const routesByEntry = await handleGeneratorEntryCode(api, entrypoints, {
                             entrypointsKey: ENTRYPOINTS_KEY,
                             hydrateRscClientRoutes: true,
+                            includeRouteServerLoadersInSsrEntry: false,
+                            isolateRouteDataInRscLayer: true,
                             serverRoutesFileName: 'tanstack-routes.server.js'
                         });
                         await writeTanstackRouterTypesForEntries({

package/dist/esm-node/cli/tanstackTypes/source.mjs

@@ -1,10 +1,10 @@
 import "node:module";
-import node_path from "node:path";
 import { makeLegalIdentifier } from "@modern-js/runtime/cli";
+import { upath } from "@modern-js/utils";
 import { createRouteStaticDataSnippet, isIndexRoute, isPathlessLayout, normalizeRelativeImport, pickModernLoaderModule, pickRouteSearchContractModules, quote, resolveFileNoExt, toTanstackPath } from "./shared.mjs";
 async function generateTanstackRouterTypesSourceForEntry(opts) {
     const { appContext, entryName, generatedDirName = 'modern-tanstack', routes } = opts;
-    const outDir = node_path.join(appContext.srcDirectory, generatedDirName, entryName);
+    const outDir = upath.join(appContext.srcDirectory, generatedDirName, entryName);
     const rootModern = routes.find((r)=>{
         const extras = r;
         return r && 'nested' === extras.type && extras.isRoot;
@@ -29,7 +29,7 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
             pendingImportName = (async ()=>{
                 const resolvedNoExt = await resolveRouteModuleNoExt(componentPath);
                 if (!resolvedNoExt) return null;
-                const relImport = normalizeRelativeImport(node_path.relative(outDir, resolvedNoExt));
+                const relImport = normalizeRelativeImport(upath.relative(outDir, resolvedNoExt));
                 const componentName = `component_${componentIndex++}`;
                 imports.push(`import ${componentName} from ${quote(relImport)};`);
                 return componentName;
@@ -43,8 +43,8 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         let absNoExt;
         if (aliasedNoExtPath.startsWith(prefix)) {
             const rel = aliasedNoExtPath.slice(prefix.length);
-            absNoExt = node_path.join(appContext.srcDirectory, rel);
-        } else absNoExt = node_path.isAbsolute(aliasedNoExtPath) ? aliasedNoExtPath : node_path.join(appContext.srcDirectory, aliasedNoExtPath);
+            absNoExt = upath.join(appContext.srcDirectory, rel);
+        } else absNoExt = upath.isAbsolute(aliasedNoExtPath) ? aliasedNoExtPath : upath.join(appContext.srcDirectory, aliasedNoExtPath);
         return resolveFileNoExt(absNoExt);
     };
     const getImportNamesForLoader = async (aliasedNoExtPath, inline, hasAction)=>{
@@ -56,7 +56,7 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         };
         const resolvedNoExt = await resolveRouteModuleNoExt(aliasedNoExtPath);
         if (!resolvedNoExt) return null;
-        const relImport = normalizeRelativeImport(node_path.relative(outDir, resolvedNoExt));
+        const relImport = normalizeRelativeImport(upath.relative(outDir, resolvedNoExt));
         const importName = `loader_${loaderIndex++}`;
         const actionName = hasAction ? importName.replace(/^loader_/, 'action_') : null;
         if (inline) {
@@ -78,7 +78,7 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         if (existing) return existing;
         const resolvedNoExt = await resolveRouteModuleNoExt(aliasedNoExtPath);
         if (!resolvedNoExt) return null;
-        const relImport = normalizeRelativeImport(node_path.relative(outDir, resolvedNoExt));
+        const relImport = normalizeRelativeImport(upath.relative(outDir, resolvedNoExt));
         const importName = 'validateSearch' === exportName ? `validateSearch_${validateSearchIndex++}` : `loaderDeps_${loaderDepsIndex++}`;
         imports.push(`import { ${exportName} as ${importName} } from ${quote(relImport)};`);
         searchContractImportMap.set(key, importName);

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

@@ -95,12 +95,19 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                     const cost = end();
                     context.ssrContext?.onTiming?.(LOADER_REPORTER_NAME, cost);
                 }
-                if (serverRouter.state.redirect) {
-                    const resolved = serverRouter.resolveRedirect ? serverRouter.resolveRedirect(serverRouter.state.redirect) : serverRouter.state.redirect;
+                const serverLoadResult = serverRouter._serverResult;
+                if (!serverLoadResult) {
                     try {
                         serverRouter.serverSsr?.cleanup?.();
                     } catch  {}
-                    return interrupt(isRSCNavigation ? handleTanstackRscRedirect(resolved.headers, _basename, resolved.status) : resolved);
+                    throw new Error('TanStack Router completed an SSR load without a server result.');
+                }
+                if ('redirect' === serverLoadResult.type) {
+                    const { redirect } = serverLoadResult;
+                    try {
+                        serverRouter.serverSsr?.cleanup?.();
+                    } catch  {}
+                    return interrupt(isRSCNavigation ? handleTanstackRscRedirect(redirect.headers, _basename, redirect.status) : redirect);
                 }
                 const routerErrors = collectRouterErrors(tanstackRouter);
                 if (routerErrors && 'clientRender' === loaderFailureMode) {
@@ -111,7 +118,7 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                     throw Object.values(routerErrors)[0];
                 }
                 await preloadMatchedRouteComponents(serverRouter);
-                context.ssrContext?.response?.status(tanstackRouter.state.statusCode);
+                context.ssrContext?.response?.status(serverLoadResult.status);
                 await serverRouter.serverSsr?.dehydrate?.();
                 if (enableRsc) {
                     if (isRSCNavigation) await waitForRouterSerialization(serverRouter);
@@ -125,7 +132,7 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                 const routerServerSnapshot = createRouterServerSnapshot({
                     framework: 'tanstack',
                     basename: _basename,
-                    statusCode: tanstackRouter.state.statusCode,
+                    statusCode: serverLoadResult.status,
                     errors: routerErrors,
                     matchedRouteIds,
                     hydrationScripts

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

@@ -24,10 +24,10 @@ function getTanstackRouteConfig(api, userConfig) {
 }
 function createTanstackRouteObjects({ hooks, routeConfig, ssrMode }) {
     const { mergedConfig, finalRouteConfig } = routeConfig;
-    const routeObjects = mergedConfig.createRoutes ? mergedConfig.createRoutes() : createTanstackRouteObjectsFromConfig({
+    const routeObjects = void 0 !== mergedConfig.createRoutes ? mergedConfig.createRoutes() : createTanstackRouteObjectsFromConfig({
         routesConfig: finalRouteConfig,
         ssrMode
-    }) || [];
+    }) ?? [];
     return hooks.modifyRoutes.call(routeObjects);
 }
 function joinBasename(baseUrl, basename) {
@@ -35,7 +35,7 @@ function joinBasename(baseUrl, basename) {
     const normalizedBase = base.startsWith('/') ? base : `/${base}`;
     const trimmedBase = normalizedBase.length > 1 ? normalizedBase.replace(/\/+$/g, '') : normalizedBase;
     const trimmedBasename = basename.replace(/^\/+|\/+$/g, '');
-    if (!trimmedBasename) return trimmedBase || '/';
+    if (0 === trimmedBasename.length) return trimmedBase || '/';
     return `${trimmedBase}/${trimmedBasename}`.replace(/\/{2,}/g, '/');
 }
 export { createTanstackRouteObjects, getMergedRouterConfig, getTanstackRouteConfig, joinBasename };

package/dist/esm-node/runtime/rsc/payloadErrors.mjs

@@ -1,5 +1,5 @@
 import "node:module";
-import { isRouteErrorResponse } from "@modern-js/runtime-utils/router";
+import { isRouteErrorResponse } from "@modern-js/runtime/routerHelper";
 function shouldRedactServerError(status = 500) {
     return status >= 500 && 'development' !== process.env.NODE_ENV && 'test' !== process.env.NODE_ENV;
 }

package/dist/esm-node/runtime/rsc/shared.mjs

@@ -16,7 +16,7 @@ function selectTreePath(tree, path) {
     return current;
 }
 function renderSelectedTree(src, { getTree = src[RSC_PROXY_GET_TREE], missingTreeError }) {
-    if (!getTree) throw new Error(missingTreeError);
+    if (void 0 === getTree) throw new Error(missingTreeError);
     return selectTreePath(getTree(), src[RSC_PROXY_PATH] || []);
 }
 export { EmptyFallback, TANSTACK_RSC_FLIGHT_VALUE, isSerializedTanstackRscFlightValue, renderSelectedTree };

package/dist/esm-node/runtime/rsc/treeGetter.mjs

@@ -9,15 +9,11 @@ function loadModernRscClientRuntime() {
     });
     return modernRscClientRuntimePromise;
 }
-async function createFromFlightStream(stream) {
-    if ("u" < typeof window) {
-        const runtime = await import("react-server-dom-rspack/client.edge");
-        return runtime.createFromReadableStream(stream);
-    }
-    const runtime = await loadModernRscClientRuntime();
-    return runtime.createFromReadableStream(stream, {
-        callServer: runtime.callServer
-    });
+function createFromFlightStream(stream) {
+    if ("u" < typeof window) return import("react-server-dom-rspack/client.edge").then((runtime)=>runtime.createFromReadableStream(stream));
+    return loadModernRscClientRuntime().then((runtime)=>runtime.createFromReadableStream(stream, {
+            callServer: runtime.callServer
+        }));
 }
 function createTreeGetterFromFlightStream(stream) {
     let ready = false;

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

@@ -12,16 +12,15 @@ function resolveRouteHandlers(router, actionTo) {
     const builtLocation = router.buildLocation({
         to: actionTo
     });
-    const href = router.getParsedLocationHref(builtLocation);
-    const matchedRoutes = router.getMatchedRoutes(builtLocation.pathname);
-    const routeStaticData = matchedRoutes.foundRoute?.options?.staticData;
+    const [, routeParams, foundRoute] = router.getMatchedRoutes(builtLocation.pathname);
+    const routeStaticData = foundRoute?.options?.staticData;
     const action = routeStaticData?.modernRouteAction;
     const loader = routeStaticData?.modernRouteLoader;
     return {
         action,
         loader,
-        href,
-        params: matchedRoutes.routeParams || {}
+        href: builtLocation.href,
+        params: routeParams
     };
 }
 function isRedirectResponse(value) {

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

@@ -2,7 +2,7 @@ import { type AnyRouter } from '@tanstack/react-router';
 export type WindowWithTanstackSsr = Window & {
     $_TSR?: unknown;
 };
-export declare function hydrateTanstackRouter(router: AnyRouter): Promise<unknown>;
+export declare function hydrateTanstackRouter(router: AnyRouter): Promise<void>;
 export declare function getTanstackSsrHydrationPromise(router: AnyRouter): Promise<unknown>;
 export declare function hasTanstackSsrHydrationRecord(router: AnyRouter): boolean;
 export declare function ModernRouterClient({ router }: {