@bleedingdev/modern-js-plugin-tanstack 3.5.0-ultramodern.36 → 3.5.0-ultramodern.37

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

@@ -1,11 +1,15 @@
+import node_path from "node:path";
 import { makeLegalIdentifier } from "@modern-js/runtime/cli";
-import path from "path";
 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 = path.join(appContext.srcDirectory, generatedDirName, entryName);
-    const rootModern = routes.find((r)=>r && 'nested' === r.type && r.isRoot);
-    const topLevel = rootModern ? rootModern.children || [] : routes;
+    const outDir = node_path.join(appContext.srcDirectory, generatedDirName, entryName);
+    const rootModern = routes.find((r)=>{
+        const extras = r;
+        return r && 'nested' === extras.type && extras.isRoot;
+    });
+    const rootExtras = rootModern;
+    const topLevel = rootModern ? rootExtras?.children || [] : routes;
     const imports = [];
     const statements = [];
     const loaderImportMap = new Map();
@@ -24,7 +28,7 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
             pendingImportName = (async ()=>{
                 const resolvedNoExt = await resolveRouteModuleNoExt(componentPath);
                 if (!resolvedNoExt) return null;
-                const relImport = normalizeRelativeImport(path.relative(outDir, resolvedNoExt));
+                const relImport = normalizeRelativeImport(node_path.relative(outDir, resolvedNoExt));
                 const componentName = `component_${componentIndex++}`;
                 imports.push(`import ${componentName} from ${quote(relImport)};`);
                 return componentName;
@@ -38,8 +42,8 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         let absNoExt;
         if (aliasedNoExtPath.startsWith(prefix)) {
             const rel = aliasedNoExtPath.slice(prefix.length);
-            absNoExt = path.join(appContext.srcDirectory, rel);
-        } else absNoExt = path.isAbsolute(aliasedNoExtPath) ? aliasedNoExtPath : path.join(appContext.srcDirectory, aliasedNoExtPath);
+            absNoExt = node_path.join(appContext.srcDirectory, rel);
+        } else absNoExt = node_path.isAbsolute(aliasedNoExtPath) ? aliasedNoExtPath : node_path.join(appContext.srcDirectory, aliasedNoExtPath);
         return resolveFileNoExt(absNoExt);
     };
     const getImportNamesForLoader = async (aliasedNoExtPath, inline, hasAction)=>{
@@ -51,7 +55,7 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         };
         const resolvedNoExt = await resolveRouteModuleNoExt(aliasedNoExtPath);
         if (!resolvedNoExt) return null;
-        const relImport = normalizeRelativeImport(path.relative(outDir, resolvedNoExt));
+        const relImport = normalizeRelativeImport(node_path.relative(outDir, resolvedNoExt));
         const importName = `loader_${loaderIndex++}`;
         const actionName = hasAction ? importName.replace(/^loader_/, 'action_') : null;
         if (inline) {
@@ -73,7 +77,7 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         if (existing) return existing;
         const resolvedNoExt = await resolveRouteModuleNoExt(aliasedNoExtPath);
         if (!resolvedNoExt) return null;
-        const relImport = normalizeRelativeImport(path.relative(outDir, resolvedNoExt));
+        const relImport = normalizeRelativeImport(node_path.relative(outDir, resolvedNoExt));
         const importName = 'validateSearch' === exportName ? `validateSearch_${validateSearchIndex++}` : `loaderDeps_${loaderDepsIndex++}`;
         imports.push(`import { ${exportName} as ${importName} } from ${quote(relImport)};`);
         searchContractImportMap.set(key, importName);
@@ -94,23 +98,24 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
     const buildRoute = async (opts)=>{
         const { parentVar, route } = opts;
         const varName = createRouteVarName(route);
+        const routeExtras = route;
         const loaderInfo = pickModernLoaderModule(route);
-        const routeAction = route.action;
+        const routeAction = routeExtras.action;
         const loaderImports = loaderInfo ? await getImportNamesForLoader(loaderInfo.loaderPath, loaderInfo.inline, Boolean(loaderInfo.inline && routeAction === loaderInfo.loaderPath)) : null;
         const loaderName = loaderImports?.loaderName || null;
         const actionName = loaderImports?.actionName || null;
         const searchContractInfo = pickRouteSearchContractModules(route);
         const validateSearchName = searchContractInfo.validateSearchPath ? await getImportNameForSearchContract(searchContractInfo.validateSearchPath, 'validateSearch') : null;
         const loaderDepsName = searchContractInfo.loaderDepsPath ? await getImportNameForSearchContract(searchContractInfo.loaderDepsPath, 'loaderDeps') : null;
-        const rawPath = route.path;
+        const rawPath = routeExtras.path;
         const hasSplat = 'string' == typeof rawPath && rawPath.includes('*');
         const routeOpts = [
             `getParentRoute: () => ${parentVar},`
         ];
-        const componentName = await getImportNameForComponent(route._component);
+        const componentName = await getImportNameForComponent(routeExtras._component);
         if (componentName) routeOpts.push(`component: ${componentName},`);
         if (isPathlessLayout(route)) {
-            const id = route.id;
+            const id = routeExtras.id;
             routeOpts.push(`id: ${quote(id || 'pathless')},`);
         } else {
             const p = isIndexRoute(route) ? '/' : toTanstackPath(rawPath || '');
@@ -120,12 +125,12 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         if (validateSearchName) routeOpts.push(`validateSearch: ${validateSearchName},`);
         if (loaderDepsName) routeOpts.push(`loaderDeps: ${loaderDepsName},`);
         const staticDataSnippet = createRouteStaticDataSnippet({
-            modernRouteId: route.id,
+            modernRouteId: routeExtras.id,
             loaderName,
             actionName
         });
         if (staticDataSnippet) routeOpts.push(staticDataSnippet);
-        const children = route.children;
+        const children = routeExtras.children;
         const hasChildren = Boolean(children && children.length > 0);
         const routeCtorVarName = hasChildren ? reserveRouteVarName(`${varName}__base`) : varName;
         statements.push(`const ${routeCtorVarName} = createRoute({\n  ${routeOpts.join('\n  ')}\n});`);
@@ -140,7 +145,7 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         return varName;
     };
     const rootLoaderInfo = rootModern ? pickModernLoaderModule(rootModern) : null;
-    const rootAction = rootModern?.action;
+    const rootAction = rootExtras?.action;
     const rootLoaderImports = rootLoaderInfo?.loaderPath ? await getImportNamesForLoader(rootLoaderInfo.loaderPath, rootLoaderInfo.inline, Boolean(rootLoaderInfo.inline && rootAction === rootLoaderInfo.loaderPath)) : null;
     const rootLoaderName = rootLoaderImports?.loaderName || null;
     const rootActionName = rootLoaderImports?.actionName || null;
@@ -153,7 +158,7 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         route
     }));
     const rootOpts = [];
-    const rootComponentName = await getImportNameForComponent(rootModern?._component);
+    const rootComponentName = await getImportNameForComponent(rootExtras?._component);
     if (rootComponentName) rootOpts.push(`component: ${rootComponentName},`);
     if (rootLoaderName) rootOpts.push(`loader: modernLoaderToTanstack({ hasSplat: false }, ${rootLoaderName}),`);
     if (rootValidateSearchName) rootOpts.push(`validateSearch: ${rootValidateSearchName},`);
@@ -177,7 +182,7 @@ ${imports.join('\n')}
 export const rootRoute = createRootRouteWithContext<ModernRouterContext>()({
   ${rootOpts.join('\n  ')}
   ${createRouteStaticDataSnippet({
-        modernRouteId: rootModern?.id,
+        modernRouteId: rootExtras?.id,
         loaderName: rootLoaderName,
         actionName: rootActionName
     }) || ''}

package/dist/esm/runtime/blockingSubscribe.mjs

@@ -16,4 +16,4 @@ function wrapRouterSubscribeWithBlockState(router, getBlockNavState) {
     };
     target[BLOCKING_SUBSCRIBE_SYMBOL] = true;
 }
-export { BLOCKING_STATE_SYMBOL, BLOCKING_SUBSCRIBE_SYMBOL, wrapRouterSubscribeWithBlockState };
+export { wrapRouterSubscribeWithBlockState };

package/dist/esm/runtime/clientHydration.mjs

@@ -67,4 +67,4 @@ function ModernRouterClient({ router }) {
         router
     });
 }
-export { ModernRouterClient, getCachedRouteModule, getTanstackSsrHydrationPromise, getTanstackSsrHydrationRecord, hasTanstackSsrHydrationRecord, hydrateTanstackRouter, preloadHydratedRouteComponents, routerHydrationRecords };
+export { ModernRouterClient, getTanstackSsrHydrationPromise, hasTanstackSsrHydrationRecord, hydrateTanstackRouter };

package/dist/esm/runtime/loaderBridge.mjs

@@ -1,4 +1,5 @@
 import { notFound, redirect } from "@tanstack/react-router";
+import { isAbsoluteUrl } from "./shared/isAbsoluteUrl.mjs";
 function isResponse(value) {
     const record = value;
     return null != record && 'object' == typeof record && 'number' == typeof record.status && 'object' == typeof record.headers;
@@ -16,14 +17,6 @@ function isRedirectResponse(res) {
 function isTanstackRedirect(value) {
     return isResponse(value) && 'object' == typeof value.options;
 }
-function isAbsoluteUrl(value) {
-    try {
-        new URL(value);
-        return true;
-    } catch  {
-        return false;
-    }
-}
 function throwTanstackRedirect(location) {
     const target = location || '/';
     if (isAbsoluteUrl(target)) throw redirect({

package/dist/esm/runtime/pluginShared.mjs

@@ -37,4 +37,4 @@ function joinBasename(baseUrl, basename) {
     if (!trimmedBasename) return trimmedBase || '/';
     return `${trimmedBase}/${trimmedBasename}`.replace(/\/{2,}/g, '/');
 }
-export { createTanstackRouteObjects, getFinalRouteConfig, getMergedRouterConfig, getTanstackRouteConfig, joinBasename };
+export { createTanstackRouteObjects, getMergedRouterConfig, getTanstackRouteConfig, joinBasename };

package/dist/esm/runtime/register.mjs

@@ -1,18 +1,4 @@
 import { registerRouterProvider } from "@modern-js/runtime/context";
-import { Form, RouteActionResponseError, useFetcher } from "./dataMutation.mjs";
-import { Outlet } from "./outlet.mjs";
 import { tanstackRouterPlugin } from "./plugin.mjs";
-import { Link, NavLink } from "./prefetchLink.mjs";
 const tanstackRouterProviderFactory = (userConfig)=>tanstackRouterPlugin(userConfig);
 registerRouterProvider('tanstack', tanstackRouterProviderFactory);
-const COMPAT_BINDINGS_SLOT = Symbol.for('@modern-js/plugin-tanstack:runtime-compat-bindings');
-const tanstackRouterCompatBindings = {
-    Form: Form,
-    Link: Link,
-    NavLink: NavLink,
-    Outlet: Outlet,
-    RouteActionResponseError: RouteActionResponseError,
-    useFetcher: useFetcher
-};
-globalThis[COMPAT_BINDINGS_SLOT] ??= tanstackRouterCompatBindings;
-export { tanstackRouterCompatBindings };

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

@@ -101,4 +101,4 @@ class ReplayableStream {
 }
 _REPLAYABLE_STREAM_MARKER = REPLAYABLE_STREAM_MARKER;
 var _REPLAYABLE_STREAM_MARKER;
-export { REPLAYABLE_STREAM_MARKER, ReplayableStream };
+export { ReplayableStream };

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

@@ -1,4 +1,5 @@
 import { notFound, redirect } from "@tanstack/react-router";
+import { isAbsoluteUrl } from "../shared/isAbsoluteUrl.mjs";
 import { reviveTanstackRscFlightValues } from "./flightSerialization.mjs";
 const payloadFetchCache = new Map();
 let payloadDecoder;
@@ -19,14 +20,6 @@ function createPayloadFetchKey(request) {
         ].sort(([left], [right])=>left.localeCompare(right))
     ]);
 }
-function isAbsoluteUrl(value) {
-    try {
-        new URL(value);
-        return true;
-    } catch  {
-        return false;
-    }
-}
 async function fetchTanstackRscPayload(request) {
     const headers = new Headers(request.headers);
     headers.set('x-rsc-tree', 'true');
@@ -59,4 +52,4 @@ function __setTanstackRscPayloadDecoderForTests(decoder) {
     payloadDecoder = decoder;
     payloadFetchCache.clear();
 }
-export { __setTanstackRscPayloadDecoderForTests, createPayloadFetchKey, decodePayload, fetchTanstackRscPayload, isAbsoluteUrl, isServerPayload, payloadFetchCache };
+export { __setTanstackRscPayloadDecoderForTests, createPayloadFetchKey, fetchTanstackRscPayload, isAbsoluteUrl, payloadFetchCache };

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

@@ -47,4 +47,4 @@ function toPayloadRoute(match) {
         pathnameBase: 'string' == typeof match.pathnameBase ? match.pathnameBase : pathname
     };
 }
-export { getRouteId, getRouteParentId, getRouteStaticData, toPayloadRoute, toPlainLocation, toPlainRecord, toRoutePath };
+export { getRouteId, toPayloadRoute, toPlainLocation };

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

@@ -18,4 +18,4 @@ function renderSelectedTree(src, { getTree = src[RSC_PROXY_GET_TREE], missingTre
     if (!getTree) throw new Error(missingTreeError);
     return selectTreePath(getTree(), src[RSC_PROXY_PATH] || []);
 }
-export { EmptyFallback, TANSTACK_RSC_FLIGHT_VALUE, isSerializedTanstackRscFlightValue, renderSelectedTree, selectTreePath };
+export { EmptyFallback, TANSTACK_RSC_FLIGHT_VALUE, isSerializedTanstackRscFlightValue, renderSelectedTree };

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

@@ -0,0 +1,9 @@
+function isAbsoluteUrl(value) {
+    try {
+        new URL(value);
+        return true;
+    } catch  {
+        return false;
+    }
+}
+export { isAbsoluteUrl };

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

@@ -7,10 +7,10 @@ import { __webpack_require__ } from "../rslib-runtime.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 * as __rspack_external__modern_js_runtime_cli_401ee077 from "@modern-js/runtime/cli";
+import * as __rspack_external__modern_js_runtime_cli_d0edd589 from "@modern-js/runtime/cli";
 __webpack_require__.add({
-    "@modern-js/runtime/cli?9b14" (module) {
-        module.exports = __rspack_external__modern_js_runtime_cli_401ee077;
+    "@modern-js/runtime/cli?32f1" (module) {
+        module.exports = __rspack_external__modern_js_runtime_cli_d0edd589;
     }
 });
 const DEFAULT_ROUTES_DIR = 'routes';
@@ -19,7 +19,7 @@ const ENTRYPOINTS_KEY = '@modern-js/plugin-tanstack';
 let runtimeRouterCli;
 function getRuntimeRouterCli() {
     if (runtimeRouterCli) return runtimeRouterCli;
-    const cli = __webpack_require__("@modern-js/runtime/cli?9b14");
+    const cli = __webpack_require__("@modern-js/runtime/cli?32f1");
     if (cli.handleGeneratorEntryCode && cli.getEntrypointRoutesDir && cli.getEntrypointRoutesOwner && cli.updateNestedRoutesSpec) {
         runtimeRouterCli = cli;
         return runtimeRouterCli;

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

@@ -11,18 +11,6 @@ const JS_OR_TS_EXTS = [
     '.cjs',
     '.cts'
 ];
-function toTanstackPath(pathname) {
-    return pathname.split('/').map((segment)=>{
-        if (!segment) return segment;
-        if ('*' === segment) return '$';
-        if (segment.startsWith(':')) {
-            const name = segment.slice(1);
-            if (name.endsWith('?')) return `{-$${name.slice(0, -1)}}`;
-            return `$${name}`;
-        }
-        return segment;
-    }).join('/');
-}
 async function resolveFileNoExt(inputNoExtPath) {
     const file = findExists(JS_OR_TS_EXTS.map((ext)=>`${inputNoExtPath}${ext}`));
     return file ? getPathWithoutExt(file) : null;
@@ -36,27 +24,31 @@ function normalizeRelativeImport(p) {
     return `./${normalized}`;
 }
 function pickModernLoaderModule(route) {
-    const loaderPath = route.data || route.loader;
+    const extras = route;
+    const loaderPath = extras.data || extras.loader;
     if (!loaderPath || 'string' != typeof loaderPath) return null;
-    const inline = Boolean(route.data);
+    const inline = Boolean(extras.data);
     return {
         loaderPath,
         inline
     };
 }
 function pickRouteSearchContractModules(route) {
-    const validateSearchPath = route.validateSearch;
-    const loaderDepsPath = route.loaderDeps;
+    const extras = route;
+    const validateSearchPath = extras.validateSearch;
+    const loaderDepsPath = extras.loaderDeps;
     return {
         validateSearchPath: 'string' == typeof validateSearchPath ? validateSearchPath : null,
         loaderDepsPath: 'string' == typeof loaderDepsPath ? loaderDepsPath : null
     };
 }
 function isPathlessLayout(route) {
-    return 'nested' === route.type && 'boolean' != typeof route.index && void 0 === route.path;
+    const extras = route;
+    return 'nested' === extras.type && 'boolean' != typeof extras.index && void 0 === extras.path;
 }
 function isIndexRoute(route) {
-    return 'nested' === route.type && Boolean(route.index);
+    const extras = route;
+    return 'nested' === extras.type && Boolean(extras.index);
 }
 function createRouteStaticDataSnippet(opts) {
     const staticDataLines = [];
@@ -66,4 +58,5 @@ function createRouteStaticDataSnippet(opts) {
     if (!staticDataLines.length) return null;
     return `staticData: createRouteStaticData({\n    ${staticDataLines.join('\n    ')}\n  }),`;
 }
-export { createRouteStaticDataSnippet, isIndexRoute, isPathlessLayout, normalizeRelativeImport, pickModernLoaderModule, pickRouteSearchContractModules, quote, resolveFileNoExt, toTanstackPath };
+export { toTanstackPath } from "../../runtime/routeTree/paths.mjs";
+export { createRouteStaticDataSnippet, isIndexRoute, isPathlessLayout, normalizeRelativeImport, pickModernLoaderModule, pickRouteSearchContractModules, quote, resolveFileNoExt };

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

@@ -1,12 +1,16 @@
 import "node:module";
+import node_path from "node:path";
 import { makeLegalIdentifier } from "@modern-js/runtime/cli";
-import path from "path";
 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 = path.join(appContext.srcDirectory, generatedDirName, entryName);
-    const rootModern = routes.find((r)=>r && 'nested' === r.type && r.isRoot);
-    const topLevel = rootModern ? rootModern.children || [] : routes;
+    const outDir = node_path.join(appContext.srcDirectory, generatedDirName, entryName);
+    const rootModern = routes.find((r)=>{
+        const extras = r;
+        return r && 'nested' === extras.type && extras.isRoot;
+    });
+    const rootExtras = rootModern;
+    const topLevel = rootModern ? rootExtras?.children || [] : routes;
     const imports = [];
     const statements = [];
     const loaderImportMap = new Map();
@@ -25,7 +29,7 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
             pendingImportName = (async ()=>{
                 const resolvedNoExt = await resolveRouteModuleNoExt(componentPath);
                 if (!resolvedNoExt) return null;
-                const relImport = normalizeRelativeImport(path.relative(outDir, resolvedNoExt));
+                const relImport = normalizeRelativeImport(node_path.relative(outDir, resolvedNoExt));
                 const componentName = `component_${componentIndex++}`;
                 imports.push(`import ${componentName} from ${quote(relImport)};`);
                 return componentName;
@@ -39,8 +43,8 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         let absNoExt;
         if (aliasedNoExtPath.startsWith(prefix)) {
             const rel = aliasedNoExtPath.slice(prefix.length);
-            absNoExt = path.join(appContext.srcDirectory, rel);
-        } else absNoExt = path.isAbsolute(aliasedNoExtPath) ? aliasedNoExtPath : path.join(appContext.srcDirectory, aliasedNoExtPath);
+            absNoExt = node_path.join(appContext.srcDirectory, rel);
+        } else absNoExt = node_path.isAbsolute(aliasedNoExtPath) ? aliasedNoExtPath : node_path.join(appContext.srcDirectory, aliasedNoExtPath);
         return resolveFileNoExt(absNoExt);
     };
     const getImportNamesForLoader = async (aliasedNoExtPath, inline, hasAction)=>{
@@ -52,7 +56,7 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         };
         const resolvedNoExt = await resolveRouteModuleNoExt(aliasedNoExtPath);
         if (!resolvedNoExt) return null;
-        const relImport = normalizeRelativeImport(path.relative(outDir, resolvedNoExt));
+        const relImport = normalizeRelativeImport(node_path.relative(outDir, resolvedNoExt));
         const importName = `loader_${loaderIndex++}`;
         const actionName = hasAction ? importName.replace(/^loader_/, 'action_') : null;
         if (inline) {
@@ -74,7 +78,7 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         if (existing) return existing;
         const resolvedNoExt = await resolveRouteModuleNoExt(aliasedNoExtPath);
         if (!resolvedNoExt) return null;
-        const relImport = normalizeRelativeImport(path.relative(outDir, resolvedNoExt));
+        const relImport = normalizeRelativeImport(node_path.relative(outDir, resolvedNoExt));
         const importName = 'validateSearch' === exportName ? `validateSearch_${validateSearchIndex++}` : `loaderDeps_${loaderDepsIndex++}`;
         imports.push(`import { ${exportName} as ${importName} } from ${quote(relImport)};`);
         searchContractImportMap.set(key, importName);
@@ -95,23 +99,24 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
     const buildRoute = async (opts)=>{
         const { parentVar, route } = opts;
         const varName = createRouteVarName(route);
+        const routeExtras = route;
         const loaderInfo = pickModernLoaderModule(route);
-        const routeAction = route.action;
+        const routeAction = routeExtras.action;
         const loaderImports = loaderInfo ? await getImportNamesForLoader(loaderInfo.loaderPath, loaderInfo.inline, Boolean(loaderInfo.inline && routeAction === loaderInfo.loaderPath)) : null;
         const loaderName = loaderImports?.loaderName || null;
         const actionName = loaderImports?.actionName || null;
         const searchContractInfo = pickRouteSearchContractModules(route);
         const validateSearchName = searchContractInfo.validateSearchPath ? await getImportNameForSearchContract(searchContractInfo.validateSearchPath, 'validateSearch') : null;
         const loaderDepsName = searchContractInfo.loaderDepsPath ? await getImportNameForSearchContract(searchContractInfo.loaderDepsPath, 'loaderDeps') : null;
-        const rawPath = route.path;
+        const rawPath = routeExtras.path;
         const hasSplat = 'string' == typeof rawPath && rawPath.includes('*');
         const routeOpts = [
             `getParentRoute: () => ${parentVar},`
         ];
-        const componentName = await getImportNameForComponent(route._component);
+        const componentName = await getImportNameForComponent(routeExtras._component);
         if (componentName) routeOpts.push(`component: ${componentName},`);
         if (isPathlessLayout(route)) {
-            const id = route.id;
+            const id = routeExtras.id;
             routeOpts.push(`id: ${quote(id || 'pathless')},`);
         } else {
             const p = isIndexRoute(route) ? '/' : toTanstackPath(rawPath || '');
@@ -121,12 +126,12 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         if (validateSearchName) routeOpts.push(`validateSearch: ${validateSearchName},`);
         if (loaderDepsName) routeOpts.push(`loaderDeps: ${loaderDepsName},`);
         const staticDataSnippet = createRouteStaticDataSnippet({
-            modernRouteId: route.id,
+            modernRouteId: routeExtras.id,
             loaderName,
             actionName
         });
         if (staticDataSnippet) routeOpts.push(staticDataSnippet);
-        const children = route.children;
+        const children = routeExtras.children;
         const hasChildren = Boolean(children && children.length > 0);
         const routeCtorVarName = hasChildren ? reserveRouteVarName(`${varName}__base`) : varName;
         statements.push(`const ${routeCtorVarName} = createRoute({\n  ${routeOpts.join('\n  ')}\n});`);
@@ -141,7 +146,7 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         return varName;
     };
     const rootLoaderInfo = rootModern ? pickModernLoaderModule(rootModern) : null;
-    const rootAction = rootModern?.action;
+    const rootAction = rootExtras?.action;
     const rootLoaderImports = rootLoaderInfo?.loaderPath ? await getImportNamesForLoader(rootLoaderInfo.loaderPath, rootLoaderInfo.inline, Boolean(rootLoaderInfo.inline && rootAction === rootLoaderInfo.loaderPath)) : null;
     const rootLoaderName = rootLoaderImports?.loaderName || null;
     const rootActionName = rootLoaderImports?.actionName || null;
@@ -154,7 +159,7 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         route
     }));
     const rootOpts = [];
-    const rootComponentName = await getImportNameForComponent(rootModern?._component);
+    const rootComponentName = await getImportNameForComponent(rootExtras?._component);
     if (rootComponentName) rootOpts.push(`component: ${rootComponentName},`);
     if (rootLoaderName) rootOpts.push(`loader: modernLoaderToTanstack({ hasSplat: false }, ${rootLoaderName}),`);
     if (rootValidateSearchName) rootOpts.push(`validateSearch: ${rootValidateSearchName},`);
@@ -178,7 +183,7 @@ ${imports.join('\n')}
 export const rootRoute = createRootRouteWithContext<ModernRouterContext>()({
   ${rootOpts.join('\n  ')}
   ${createRouteStaticDataSnippet({
-        modernRouteId: rootModern?.id,
+        modernRouteId: rootExtras?.id,
         loaderName: rootLoaderName,
         actionName: rootActionName
     }) || ''}

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

@@ -17,4 +17,4 @@ function wrapRouterSubscribeWithBlockState(router, getBlockNavState) {
     };
     target[BLOCKING_SUBSCRIBE_SYMBOL] = true;
 }
-export { BLOCKING_STATE_SYMBOL, BLOCKING_SUBSCRIBE_SYMBOL, wrapRouterSubscribeWithBlockState };
+export { wrapRouterSubscribeWithBlockState };

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

@@ -68,4 +68,4 @@ function ModernRouterClient({ router }) {
         router
     });
 }
-export { ModernRouterClient, getCachedRouteModule, getTanstackSsrHydrationPromise, getTanstackSsrHydrationRecord, hasTanstackSsrHydrationRecord, hydrateTanstackRouter, preloadHydratedRouteComponents, routerHydrationRecords };
+export { ModernRouterClient, getTanstackSsrHydrationPromise, hasTanstackSsrHydrationRecord, hydrateTanstackRouter };

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

@@ -1,5 +1,6 @@
 import "node:module";
 import { notFound, redirect } from "@tanstack/react-router";
+import { isAbsoluteUrl } from "./shared/isAbsoluteUrl.mjs";
 function isResponse(value) {
     const record = value;
     return null != record && 'object' == typeof record && 'number' == typeof record.status && 'object' == typeof record.headers;
@@ -17,14 +18,6 @@ function isRedirectResponse(res) {
 function isTanstackRedirect(value) {
     return isResponse(value) && 'object' == typeof value.options;
 }
-function isAbsoluteUrl(value) {
-    try {
-        new URL(value);
-        return true;
-    } catch  {
-        return false;
-    }
-}
 function throwTanstackRedirect(location) {
     const target = location || '/';
     if (isAbsoluteUrl(target)) throw redirect({

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

@@ -38,4 +38,4 @@ function joinBasename(baseUrl, basename) {
     if (!trimmedBasename) return trimmedBase || '/';
     return `${trimmedBase}/${trimmedBasename}`.replace(/\/{2,}/g, '/');
 }
-export { createTanstackRouteObjects, getFinalRouteConfig, getMergedRouterConfig, getTanstackRouteConfig, joinBasename };
+export { createTanstackRouteObjects, getMergedRouterConfig, getTanstackRouteConfig, joinBasename };

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

@@ -1,19 +1,5 @@
 import "node:module";
 import { registerRouterProvider } from "@modern-js/runtime/context";
-import { Form, RouteActionResponseError, useFetcher } from "./dataMutation.mjs";
-import { Outlet } from "./outlet.mjs";
 import { tanstackRouterPlugin } from "./plugin.mjs";
-import { Link, NavLink } from "./prefetchLink.mjs";
 const tanstackRouterProviderFactory = (userConfig)=>tanstackRouterPlugin(userConfig);
 registerRouterProvider('tanstack', tanstackRouterProviderFactory);
-const COMPAT_BINDINGS_SLOT = Symbol.for('@modern-js/plugin-tanstack:runtime-compat-bindings');
-const tanstackRouterCompatBindings = {
-    Form: Form,
-    Link: Link,
-    NavLink: NavLink,
-    Outlet: Outlet,
-    RouteActionResponseError: RouteActionResponseError,
-    useFetcher: useFetcher
-};
-globalThis[COMPAT_BINDINGS_SLOT] ??= tanstackRouterCompatBindings;
-export { tanstackRouterCompatBindings };

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

@@ -102,4 +102,4 @@ class ReplayableStream {
 }
 _REPLAYABLE_STREAM_MARKER = REPLAYABLE_STREAM_MARKER;
 var _REPLAYABLE_STREAM_MARKER;
-export { REPLAYABLE_STREAM_MARKER, ReplayableStream };
+export { ReplayableStream };

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

@@ -1,5 +1,6 @@
 import "node:module";
 import { notFound, redirect } from "@tanstack/react-router";
+import { isAbsoluteUrl } from "../shared/isAbsoluteUrl.mjs";
 import { reviveTanstackRscFlightValues } from "./flightSerialization.mjs";
 const payloadFetchCache = new Map();
 let payloadDecoder;
@@ -20,14 +21,6 @@ function createPayloadFetchKey(request) {
         ].sort(([left], [right])=>left.localeCompare(right))
     ]);
 }
-function isAbsoluteUrl(value) {
-    try {
-        new URL(value);
-        return true;
-    } catch  {
-        return false;
-    }
-}
 async function fetchTanstackRscPayload(request) {
     const headers = new Headers(request.headers);
     headers.set('x-rsc-tree', 'true');
@@ -60,4 +53,4 @@ function __setTanstackRscPayloadDecoderForTests(decoder) {
     payloadDecoder = decoder;
     payloadFetchCache.clear();
 }
-export { __setTanstackRscPayloadDecoderForTests, createPayloadFetchKey, decodePayload, fetchTanstackRscPayload, isAbsoluteUrl, isServerPayload, payloadFetchCache };
+export { __setTanstackRscPayloadDecoderForTests, createPayloadFetchKey, fetchTanstackRscPayload, isAbsoluteUrl, payloadFetchCache };

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

@@ -48,4 +48,4 @@ function toPayloadRoute(match) {
         pathnameBase: 'string' == typeof match.pathnameBase ? match.pathnameBase : pathname
     };
 }
-export { getRouteId, getRouteParentId, getRouteStaticData, toPayloadRoute, toPlainLocation, toPlainRecord, toRoutePath };
+export { getRouteId, toPayloadRoute, toPlainLocation };

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

@@ -19,4 +19,4 @@ function renderSelectedTree(src, { getTree = src[RSC_PROXY_GET_TREE], missingTre
     if (!getTree) throw new Error(missingTreeError);
     return selectTreePath(getTree(), src[RSC_PROXY_PATH] || []);
 }
-export { EmptyFallback, TANSTACK_RSC_FLIGHT_VALUE, isSerializedTanstackRscFlightValue, renderSelectedTree, selectTreePath };
+export { EmptyFallback, TANSTACK_RSC_FLIGHT_VALUE, isSerializedTanstackRscFlightValue, renderSelectedTree };

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

@@ -0,0 +1,10 @@
+import "node:module";
+function isAbsoluteUrl(value) {
+    try {
+        new URL(value);
+        return true;
+    } catch  {
+        return false;
+    }
+}
+export { isAbsoluteUrl };

package/dist/types/cli/tanstackTypes/shared.d.ts

@@ -1,5 +1,5 @@
 import type { NestedRouteForCli, PageRoute } from '@modern-js/types';
-export declare function toTanstackPath(pathname: string): string;
+export { toTanstackPath } from '../../runtime/routeTree/paths';
 export declare function resolveFileNoExt(inputNoExtPath: string): Promise<string | null>;
 export declare function quote(str: string): string;
 export declare function normalizeRelativeImport(p: string): string;

package/dist/types/cli/tanstackTypes/source.d.ts

@@ -1,10 +1,12 @@
 import type { AppToolsContext } from '@modern-js/app-tools';
 import type { NestedRouteForCli, PageRoute } from '@modern-js/types';
+type RouteForCli = NestedRouteForCli | PageRoute;
 export declare function generateTanstackRouterTypesSourceForEntry(opts: {
     appContext: AppToolsContext;
     entryName: string;
     generatedDirName?: string;
-    routes: (NestedRouteForCli | PageRoute)[];
+    routes: RouteForCli[];
 }): Promise<{
     routerGenTs: string;
 }>;
+export {};

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

@@ -1,3 +1 @@
-export declare const BLOCKING_SUBSCRIBE_SYMBOL: unique symbol;
-export declare const BLOCKING_STATE_SYMBOL: unique symbol;
 export declare function wrapRouterSubscribeWithBlockState(router: unknown, getBlockNavState?: () => boolean): void;

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

@@ -2,16 +2,7 @@ import { type AnyRouter } from '@tanstack/react-router';
 export type WindowWithTanstackSsr = Window & {
     $_TSR?: unknown;
 };
-export type RouterHydrationRecord = {
-    error?: unknown;
-    promise: Promise<unknown>;
-    status: 'pending' | 'fulfilled' | 'rejected';
-};
-export declare const routerHydrationRecords: WeakMap<AnyRouter, RouterHydrationRecord>;
-export declare function getCachedRouteModule(routeId: string): unknown;
-export declare function preloadHydratedRouteComponents(router: AnyRouter): Promise<void>;
 export declare function hydrateTanstackRouter(router: AnyRouter): Promise<unknown>;
-export declare function getTanstackSsrHydrationRecord(router: AnyRouter): RouterHydrationRecord;
 export declare function getTanstackSsrHydrationPromise(router: AnyRouter): Promise<unknown>;
 export declare function hasTanstackSsrHydrationRecord(router: AnyRouter): boolean;
 export declare function ModernRouterClient({ router }: {