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

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

@@ -36,10 +36,11 @@ __webpack_require__.d(__webpack_exports__, {
     pickRouteSearchContractModules: ()=>pickRouteSearchContractModules,
     quote: ()=>quote,
     resolveFileNoExt: ()=>resolveFileNoExt,
-    toTanstackPath: ()=>toTanstackPath
+    toTanstackPath: ()=>paths_js_namespaceObject.toTanstackPath
 });
 const cli_namespaceObject = require("@modern-js/runtime/cli");
 const utils_namespaceObject = require("@modern-js/utils");
+const paths_js_namespaceObject = require("../../runtime/routeTree/paths.js");
 const JS_OR_TS_EXTS = [
     '.js',
     '.jsx',
@@ -50,18 +51,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 = (0, utils_namespaceObject.findExists)(JS_OR_TS_EXTS.map((ext)=>`${inputNoExtPath}${ext}`));
     return file ? (0, cli_namespaceObject.getPathWithoutExt)(file) : null;
@@ -75,27 +64,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 = [];

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

@@ -39,15 +39,19 @@ __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 external_path_namespaceObject = require("path");
-var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
 const external_shared_js_namespaceObject = require("./shared.js");
 async function generateTanstackRouterTypesSourceForEntry(opts) {
     const { appContext, entryName, generatedDirName = 'modern-tanstack', routes } = opts;
-    const outDir = external_path_default().join(appContext.srcDirectory, generatedDirName, entryName);
-    const rootModern = routes.find((r)=>r && 'nested' === r.type && r.isRoot);
-    const topLevel = rootModern ? rootModern.children || [] : routes;
+    const outDir = external_node_path_default().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();
@@ -66,7 +70,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_path_default().relative(outDir, resolvedNoExt));
+                const relImport = (0, external_shared_js_namespaceObject.normalizeRelativeImport)(external_node_path_default().relative(outDir, resolvedNoExt));
                 const componentName = `component_${componentIndex++}`;
                 imports.push(`import ${componentName} from ${(0, external_shared_js_namespaceObject.quote)(relImport)};`);
                 return componentName;
@@ -80,8 +84,8 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         let absNoExt;
         if (aliasedNoExtPath.startsWith(prefix)) {
             const rel = aliasedNoExtPath.slice(prefix.length);
-            absNoExt = external_path_default().join(appContext.srcDirectory, rel);
-        } else absNoExt = external_path_default().isAbsolute(aliasedNoExtPath) ? aliasedNoExtPath : external_path_default().join(appContext.srcDirectory, aliasedNoExtPath);
+            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);
         return (0, external_shared_js_namespaceObject.resolveFileNoExt)(absNoExt);
     };
     const getImportNamesForLoader = async (aliasedNoExtPath, inline, hasAction)=>{
@@ -93,7 +97,7 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         };
         const resolvedNoExt = await resolveRouteModuleNoExt(aliasedNoExtPath);
         if (!resolvedNoExt) return null;
-        const relImport = (0, external_shared_js_namespaceObject.normalizeRelativeImport)(external_path_default().relative(outDir, resolvedNoExt));
+        const relImport = (0, external_shared_js_namespaceObject.normalizeRelativeImport)(external_node_path_default().relative(outDir, resolvedNoExt));
         const importName = `loader_${loaderIndex++}`;
         const actionName = hasAction ? importName.replace(/^loader_/, 'action_') : null;
         if (inline) {
@@ -115,7 +119,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_path_default().relative(outDir, resolvedNoExt));
+        const relImport = (0, external_shared_js_namespaceObject.normalizeRelativeImport)(external_node_path_default().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);
@@ -136,23 +140,24 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
     const buildRoute = async (opts)=>{
         const { parentVar, route } = opts;
         const varName = createRouteVarName(route);
+        const routeExtras = route;
         const loaderInfo = (0, external_shared_js_namespaceObject.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 = (0, external_shared_js_namespaceObject.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 ((0, external_shared_js_namespaceObject.isPathlessLayout)(route)) {
-            const id = route.id;
+            const id = routeExtras.id;
             routeOpts.push(`id: ${(0, external_shared_js_namespaceObject.quote)(id || 'pathless')},`);
         } else {
             const p = (0, external_shared_js_namespaceObject.isIndexRoute)(route) ? '/' : (0, external_shared_js_namespaceObject.toTanstackPath)(rawPath || '');
@@ -162,12 +167,12 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         if (validateSearchName) routeOpts.push(`validateSearch: ${validateSearchName},`);
         if (loaderDepsName) routeOpts.push(`loaderDeps: ${loaderDepsName},`);
         const staticDataSnippet = (0, external_shared_js_namespaceObject.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});`);
@@ -182,7 +187,7 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         return varName;
     };
     const rootLoaderInfo = rootModern ? (0, external_shared_js_namespaceObject.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;
@@ -195,7 +200,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},`);
@@ -219,7 +224,7 @@ ${imports.join('\n')}
 export const rootRoute = createRootRouteWithContext<ModernRouterContext>()({
   ${rootOpts.join('\n  ')}
   ${(0, external_shared_js_namespaceObject.createRouteStaticDataSnippet)({
-        modernRouteId: rootModern?.id,
+        modernRouteId: rootExtras?.id,
         loaderName: rootLoaderName,
         actionName: rootActionName
     }) || ''}

package/dist/cjs/runtime/blockingSubscribe.js

@@ -47,16 +47,9 @@ function wrapRouterSubscribeWithBlockState(router, getBlockNavState) {
 }
 __webpack_require__.d(__webpack_exports__, {
     wrapRouterSubscribeWithBlockState: ()=>wrapRouterSubscribeWithBlockState
-}, {
-    BLOCKING_STATE_SYMBOL: BLOCKING_STATE_SYMBOL,
-    BLOCKING_SUBSCRIBE_SYMBOL: BLOCKING_SUBSCRIBE_SYMBOL
 });
-exports.BLOCKING_STATE_SYMBOL = __webpack_exports__.BLOCKING_STATE_SYMBOL;
-exports.BLOCKING_SUBSCRIBE_SYMBOL = __webpack_exports__.BLOCKING_SUBSCRIBE_SYMBOL;
 exports.wrapRouterSubscribeWithBlockState = __webpack_exports__.wrapRouterSubscribeWithBlockState;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
-    "BLOCKING_STATE_SYMBOL",
-    "BLOCKING_SUBSCRIBE_SYMBOL",
     "wrapRouterSubscribeWithBlockState"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

package/dist/cjs/runtime/clientHydration.js

@@ -29,13 +29,9 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     ModernRouterClient: ()=>ModernRouterClient,
-    getCachedRouteModule: ()=>getCachedRouteModule,
     getTanstackSsrHydrationPromise: ()=>getTanstackSsrHydrationPromise,
-    getTanstackSsrHydrationRecord: ()=>getTanstackSsrHydrationRecord,
     hasTanstackSsrHydrationRecord: ()=>hasTanstackSsrHydrationRecord,
-    hydrateTanstackRouter: ()=>hydrateTanstackRouter,
-    preloadHydratedRouteComponents: ()=>preloadHydratedRouteComponents,
-    routerHydrationRecords: ()=>routerHydrationRecords
+    hydrateTanstackRouter: ()=>hydrateTanstackRouter
 });
 const react_router_namespaceObject = require("@tanstack/react-router");
 const external_react_namespaceObject = require("react");
@@ -107,22 +103,14 @@ function ModernRouterClient({ router }) {
     });
 }
 exports.ModernRouterClient = __webpack_exports__.ModernRouterClient;
-exports.getCachedRouteModule = __webpack_exports__.getCachedRouteModule;
 exports.getTanstackSsrHydrationPromise = __webpack_exports__.getTanstackSsrHydrationPromise;
-exports.getTanstackSsrHydrationRecord = __webpack_exports__.getTanstackSsrHydrationRecord;
 exports.hasTanstackSsrHydrationRecord = __webpack_exports__.hasTanstackSsrHydrationRecord;
 exports.hydrateTanstackRouter = __webpack_exports__.hydrateTanstackRouter;
-exports.preloadHydratedRouteComponents = __webpack_exports__.preloadHydratedRouteComponents;
-exports.routerHydrationRecords = __webpack_exports__.routerHydrationRecords;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "ModernRouterClient",
-    "getCachedRouteModule",
     "getTanstackSsrHydrationPromise",
-    "getTanstackSsrHydrationRecord",
     "hasTanstackSsrHydrationRecord",
-    "hydrateTanstackRouter",
-    "preloadHydratedRouteComponents",
-    "routerHydrationRecords"
+    "hydrateTanstackRouter"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/dist/cjs/runtime/loaderBridge.js

@@ -29,7 +29,7 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     createRouteStaticData: ()=>createRouteStaticData,
-    isAbsoluteUrl: ()=>isAbsoluteUrl,
+    isAbsoluteUrl: ()=>isAbsoluteUrl_js_namespaceObject.isAbsoluteUrl,
     isRedirectResponse: ()=>isRedirectResponse,
     isResponse: ()=>isResponse,
     isTanstackRedirect: ()=>isTanstackRedirect,
@@ -38,6 +38,7 @@ __webpack_require__.d(__webpack_exports__, {
     throwTanstackRedirect: ()=>throwTanstackRedirect
 });
 const react_router_namespaceObject = require("@tanstack/react-router");
+const isAbsoluteUrl_js_namespaceObject = require("./shared/isAbsoluteUrl.js");
 function isResponse(value) {
     const record = value;
     return null != record && 'object' == typeof record && 'number' == typeof record.status && 'object' == typeof record.headers;
@@ -55,17 +56,9 @@ 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 (0, react_router_namespaceObject.redirect)({
+    if ((0, isAbsoluteUrl_js_namespaceObject.isAbsoluteUrl)(target)) throw (0, react_router_namespaceObject.redirect)({
         href: target
     });
     throw (0, react_router_namespaceObject.redirect)({

package/dist/cjs/runtime/pluginShared.js

@@ -29,7 +29,6 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     createTanstackRouteObjects: ()=>createTanstackRouteObjects,
-    getFinalRouteConfig: ()=>getFinalRouteConfig,
     getMergedRouterConfig: ()=>getMergedRouterConfig,
     getTanstackRouteConfig: ()=>getTanstackRouteConfig,
     joinBasename: ()=>joinBasename
@@ -74,13 +73,11 @@ function joinBasename(baseUrl, basename) {
     return `${trimmedBase}/${trimmedBasename}`.replace(/\/{2,}/g, '/');
 }
 exports.createTanstackRouteObjects = __webpack_exports__.createTanstackRouteObjects;
-exports.getFinalRouteConfig = __webpack_exports__.getFinalRouteConfig;
 exports.getMergedRouterConfig = __webpack_exports__.getMergedRouterConfig;
 exports.getTanstackRouteConfig = __webpack_exports__.getTanstackRouteConfig;
 exports.joinBasename = __webpack_exports__.joinBasename;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "createTanstackRouteObjects",
-    "getFinalRouteConfig",
     "getMergedRouterConfig",
     "getTanstackRouteConfig",
     "joinBasename"

package/dist/cjs/runtime/register.js

@@ -1,56 +1,10 @@
 "use strict";
-var __webpack_require__ = {};
-(()=>{
-    __webpack_require__.d = (exports1, getters, values)=>{
-        var define = (defs, kind)=>{
-            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-                enumerable: true,
-                [kind]: defs[key]
-            });
-        };
-        define(getters, "get");
-        define(values, "value");
-    };
-})();
-(()=>{
-    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
-})();
-(()=>{
-    __webpack_require__.r = (exports1)=>{
-        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
-            value: 'Module'
-        });
-        Object.defineProperty(exports1, '__esModule', {
-            value: true
-        });
-    };
-})();
 var __webpack_exports__ = {};
-__webpack_require__.r(__webpack_exports__);
-__webpack_require__.d(__webpack_exports__, {
-    tanstackRouterCompatBindings: ()=>tanstackRouterCompatBindings
-});
 const context_namespaceObject = require("@modern-js/runtime/context");
-const external_dataMutation_js_namespaceObject = require("./dataMutation.js");
-const external_outlet_js_namespaceObject = require("./outlet.js");
 const external_plugin_js_namespaceObject = require("./plugin.js");
-const external_prefetchLink_js_namespaceObject = require("./prefetchLink.js");
 const tanstackRouterProviderFactory = (userConfig)=>(0, external_plugin_js_namespaceObject.tanstackRouterPlugin)(userConfig);
 (0, context_namespaceObject.registerRouterProvider)('tanstack', tanstackRouterProviderFactory);
-const COMPAT_BINDINGS_SLOT = Symbol.for('@modern-js/plugin-tanstack:runtime-compat-bindings');
-const tanstackRouterCompatBindings = {
-    Form: external_dataMutation_js_namespaceObject.Form,
-    Link: external_prefetchLink_js_namespaceObject.Link,
-    NavLink: external_prefetchLink_js_namespaceObject.NavLink,
-    Outlet: external_outlet_js_namespaceObject.Outlet,
-    RouteActionResponseError: external_dataMutation_js_namespaceObject.RouteActionResponseError,
-    useFetcher: external_dataMutation_js_namespaceObject.useFetcher
-};
-globalThis[COMPAT_BINDINGS_SLOT] ??= tanstackRouterCompatBindings;
-exports.tanstackRouterCompatBindings = __webpack_exports__.tanstackRouterCompatBindings;
-for(var __rspack_i in __webpack_exports__)if (-1 === [
-    "tanstackRouterCompatBindings"
-].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+for(var __rspack_i in __webpack_exports__)exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true
 });

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

@@ -132,13 +132,9 @@ _REPLAYABLE_STREAM_MARKER = REPLAYABLE_STREAM_MARKER;
 var _REPLAYABLE_STREAM_MARKER;
 __webpack_require__.d(__webpack_exports__, {
     ReplayableStream: ()=>ReplayableStream
-}, {
-    REPLAYABLE_STREAM_MARKER: REPLAYABLE_STREAM_MARKER
 });
-exports.REPLAYABLE_STREAM_MARKER = __webpack_exports__.REPLAYABLE_STREAM_MARKER;
 exports.ReplayableStream = __webpack_exports__.ReplayableStream;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
-    "REPLAYABLE_STREAM_MARKER",
     "ReplayableStream"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

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

@@ -30,13 +30,12 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     __setTanstackRscPayloadDecoderForTests: ()=>__setTanstackRscPayloadDecoderForTests,
     createPayloadFetchKey: ()=>createPayloadFetchKey,
-    decodePayload: ()=>decodePayload,
     fetchTanstackRscPayload: ()=>fetchTanstackRscPayload,
-    isAbsoluteUrl: ()=>isAbsoluteUrl,
-    isServerPayload: ()=>isServerPayload,
+    isAbsoluteUrl: ()=>isAbsoluteUrl_js_namespaceObject.isAbsoluteUrl,
     payloadFetchCache: ()=>payloadFetchCache
 });
 const react_router_namespaceObject = require("@tanstack/react-router");
+const isAbsoluteUrl_js_namespaceObject = require("../shared/isAbsoluteUrl.js");
 const external_flightSerialization_js_namespaceObject = require("./flightSerialization.js");
 const payloadFetchCache = new Map();
 let payloadDecoder;
@@ -57,14 +56,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');
@@ -76,7 +67,7 @@ async function fetchTanstackRscPayload(request) {
     });
     const redirectLocation = response.headers.get('X-Modernjs-Redirect');
     if (redirectLocation) {
-        if (isAbsoluteUrl(redirectLocation)) throw (0, react_router_namespaceObject.redirect)({
+        if ((0, isAbsoluteUrl_js_namespaceObject.isAbsoluteUrl)(redirectLocation)) throw (0, react_router_namespaceObject.redirect)({
             headers: response.headers,
             href: redirectLocation,
             statusCode: response.status
@@ -99,18 +90,14 @@ function __setTanstackRscPayloadDecoderForTests(decoder) {
 }
 exports.__setTanstackRscPayloadDecoderForTests = __webpack_exports__.__setTanstackRscPayloadDecoderForTests;
 exports.createPayloadFetchKey = __webpack_exports__.createPayloadFetchKey;
-exports.decodePayload = __webpack_exports__.decodePayload;
 exports.fetchTanstackRscPayload = __webpack_exports__.fetchTanstackRscPayload;
 exports.isAbsoluteUrl = __webpack_exports__.isAbsoluteUrl;
-exports.isServerPayload = __webpack_exports__.isServerPayload;
 exports.payloadFetchCache = __webpack_exports__.payloadFetchCache;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "__setTanstackRscPayloadDecoderForTests",
     "createPayloadFetchKey",
-    "decodePayload",
     "fetchTanstackRscPayload",
     "isAbsoluteUrl",
-    "isServerPayload",
     "payloadFetchCache"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

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

@@ -78,28 +78,16 @@ function toPayloadRoute(match) {
 }
 __webpack_require__.d(__webpack_exports__, {
     getRouteId: ()=>getRouteId,
-    getRouteParentId: ()=>getRouteParentId,
-    getRouteStaticData: ()=>getRouteStaticData,
     toPayloadRoute: ()=>toPayloadRoute,
-    toPlainLocation: ()=>toPlainLocation,
-    toPlainRecord: ()=>toPlainRecord,
-    toRoutePath: ()=>toRoutePath
+    toPlainLocation: ()=>toPlainLocation
 });
 exports.getRouteId = __webpack_exports__.getRouteId;
-exports.getRouteParentId = __webpack_exports__.getRouteParentId;
-exports.getRouteStaticData = __webpack_exports__.getRouteStaticData;
 exports.toPayloadRoute = __webpack_exports__.toPayloadRoute;
 exports.toPlainLocation = __webpack_exports__.toPlainLocation;
-exports.toPlainRecord = __webpack_exports__.toPlainRecord;
-exports.toRoutePath = __webpack_exports__.toRoutePath;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "getRouteId",
-    "getRouteParentId",
-    "getRouteStaticData",
     "toPayloadRoute",
-    "toPlainLocation",
-    "toPlainRecord",
-    "toRoutePath"
+    "toPlainLocation"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true

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

@@ -31,8 +31,7 @@ __webpack_require__.d(__webpack_exports__, {
     EmptyFallback: ()=>EmptyFallback,
     TANSTACK_RSC_FLIGHT_VALUE: ()=>TANSTACK_RSC_FLIGHT_VALUE,
     isSerializedTanstackRscFlightValue: ()=>isSerializedTanstackRscFlightValue,
-    renderSelectedTree: ()=>renderSelectedTree,
-    selectTreePath: ()=>selectTreePath
+    renderSelectedTree: ()=>renderSelectedTree
 });
 const external_symbols_js_namespaceObject = require("./symbols.js");
 const TANSTACK_RSC_FLIGHT_VALUE = '__modernTanstackRsc';
@@ -58,13 +57,11 @@ exports.EmptyFallback = __webpack_exports__.EmptyFallback;
 exports.TANSTACK_RSC_FLIGHT_VALUE = __webpack_exports__.TANSTACK_RSC_FLIGHT_VALUE;
 exports.isSerializedTanstackRscFlightValue = __webpack_exports__.isSerializedTanstackRscFlightValue;
 exports.renderSelectedTree = __webpack_exports__.renderSelectedTree;
-exports.selectTreePath = __webpack_exports__.selectTreePath;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "EmptyFallback",
     "TANSTACK_RSC_FLIGHT_VALUE",
     "isSerializedTanstackRscFlightValue",
-    "renderSelectedTree",
-    "selectTreePath"
+    "renderSelectedTree"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true

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

@@ -0,0 +1,47 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+function isAbsoluteUrl(value) {
+    try {
+        new URL(value);
+        return true;
+    } catch  {
+        return false;
+    }
+}
+__webpack_require__.d(__webpack_exports__, {
+    isAbsoluteUrl: ()=>isAbsoluteUrl
+});
+exports.isAbsoluteUrl = __webpack_exports__.isAbsoluteUrl;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "isAbsoluteUrl"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/esm/cli/index.mjs

@@ -3,10 +3,10 @@ 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.mjs";
-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({
-    2320 (module) {
-        module.exports = __rspack_external__modern_js_runtime_cli_401ee077;
+    3203 (module) {
+        module.exports = __rspack_external__modern_js_runtime_cli_d0edd589;
     }
 });
 const DEFAULT_ROUTES_DIR = 'routes';
@@ -15,7 +15,7 @@ const ENTRYPOINTS_KEY = '@modern-js/plugin-tanstack';
 let runtimeRouterCli;
 function getRuntimeRouterCli() {
     if (runtimeRouterCli) return runtimeRouterCli;
-    const cli = __webpack_require__(2320);
+    const cli = __webpack_require__(3203);
     if (cli.handleGeneratorEntryCode && cli.getEntrypointRoutesDir && cli.getEntrypointRoutesOwner && cli.updateNestedRoutesSpec) {
         runtimeRouterCli = cli;
         return runtimeRouterCli;

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

@@ -10,18 +10,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;
@@ -35,27 +23,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 = [];
@@ -65,4 +57,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 };