@bleedingdev/modern-js-plugin-tanstack 3.8.1-ultramodern.1 → 3.8.1-ultramodern.3

package/dist/esm/runtime/plugin.mjs

@@ -13,7 +13,7 @@ import { applyRouterRuntimeState } from "./lifecycle.mjs";
 import { createTanstackRouteObjects, getMergedRouterConfig, getTanstackRouteConfig, joinBasename } from "./pluginShared.mjs";
 import { Link } from "./prefetchLink.mjs";
 import { useMatches } from "./routeHooks.mjs";
-import { createRouteTreeFromRouteObjects } from "./routeTree.mjs";
+import { createRouteTreeFromRouteObjects } from "./routeTree/index.mjs";
 import { getTanstackRscSerializationAdapters } from "./rsc/client.mjs";
 import { getModernTanstackRouterFastDefaults } from "./types.mjs";
 const tanstackRouterPlugin = (userConfig = {})=>{
@@ -126,7 +126,7 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                 if (hasSSRBootstrap && getRouteObjects().length > 0) {
                     const runtimeContext = context;
                     const router = getRouter(runtimeContext, getClientBasename(runtimeContext));
-                    if (null != router) return getTanstackSsrHydrationPromise(router).then(()=>void 0);
+                    if (router) return getTanstackSsrHydrationPromise(router).then(()=>void 0);
                 }
             });
             api.wrapRoot((App)=>{
@@ -156,20 +156,19 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                         router
                     };
                     const hasSSRBootstrap = "u" > typeof window && (Boolean(window.$_TSR) || hasTanstackSsrHydrationRecord(router));
-                    const needsRouterClient = hasSSRBootstrap;
-                    if (needsRouterClient) hooks.onBeforeHydrateRouter.call({
+                    if (hasSSRBootstrap) hooks.onBeforeHydrateRouter.call({
                         ...lifecycleContext,
                         phase: 'hydrate',
                         router,
                         runtimeContext: runtimeState
                     });
-                    const RouterContent = needsRouterClient ? /*#__PURE__*/ jsx(ModernRouterClient, {
+                    const RouterContent = hasSSRBootstrap ? /*#__PURE__*/ jsx(ModernRouterClient, {
                         router: router
                     }) : /*#__PURE__*/ jsx(RouterProvider, {
                         router: router
                     });
                     const HydratableRouterContent = wrapTanstackSsrHydrationBoundary(RouterContent, hasSSRBootstrap);
-                    if (needsRouterClient) hooks.onAfterHydrateRouter.call({
+                    if (hasSSRBootstrap) hooks.onAfterHydrateRouter.call({
                         ...lifecycleContext,
                         phase: 'hydrate',
                         router,

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

@@ -10,7 +10,7 @@ import { routerProviderRegistryHooks } from "./hooks.mjs";
 import { wrapTanstackSsrHydrationBoundary } from "./hydrationBoundary.mjs";
 import { applyRouterServerPrepareResult, createRouterServerSnapshot, getRouterRuntimeState } from "./lifecycle.mjs";
 import { createTanstackRouteObjects, getTanstackRouteConfig, joinBasename } from "./pluginShared.mjs";
-import { createRouteTreeFromRouteObjects, getModernRouteIdsFromMatches } from "./routeTree.mjs";
+import { createRouteTreeFromRouteObjects, getModernRouteIdsFromMatches } from "./routeTree/index.mjs";
 import { createTanstackRscServerPayload, handleTanstackRscRedirect } from "./rsc/payloadRouter.mjs";
 import { getTanstackRscRouter, setTanstackRscRouter, setTanstackRscServerPayload } from "./rsc/payloadStorage.mjs";
 import { attachServerSsrUtils, collectRouterErrors, createGetSsrHref, routerManagedTagsToHtml, waitForRouterSerialization } from "./ssrManagedTags.mjs";
@@ -24,16 +24,15 @@ const tanstackRouterPlugin = (userConfig = {})=>{
             api.onBeforeRender(async (context, interrupt)=>{
                 const routeConfig = getTanstackRouteConfig(api, userConfig);
                 const { mergedConfig } = routeConfig;
-                const serializationAdapters = getGlobalEnableRsc() ? (await import("./rsc/server.mjs")).getTanstackRscSerializationAdapters() : void 0;
                 const enableRsc = getGlobalEnableRsc();
+                const serializationAdapters = enableRsc ? (await import("./rsc/server.mjs")).getTanstackRscSerializationAdapters() : void 0;
                 const { basename = '' } = mergedConfig;
                 if (!routeConfig.hasConfiguredRoutes) return;
                 const hooks = api.getHooks();
                 await hooks.onBeforeCreateRoutes.call(context);
                 const modifiedRouteObjects = createTanstackRouteObjects({
                     hooks,
-                    routeConfig,
-                    ssrMode: context.ssrContext?.mode
+                    routeConfig
                 });
                 if (!modifiedRouteObjects.length) return;
                 const { request, nonce, baseUrl, loaderFailureMode = 'errorBoundary' } = context.ssrContext;

package/dist/esm/runtime/pluginShared.mjs

@@ -21,11 +21,10 @@ function getTanstackRouteConfig(api, userConfig) {
         hasConfiguredRoutes: Boolean(finalRouteConfig.routes) || Boolean(mergedConfig.createRoutes)
     };
 }
-function createTanstackRouteObjects({ hooks, routeConfig, ssrMode }) {
+function createTanstackRouteObjects({ hooks, routeConfig }) {
     const { mergedConfig, finalRouteConfig } = routeConfig;
     const routeObjects = void 0 !== mergedConfig.createRoutes ? mergedConfig.createRoutes() : createTanstackRouteObjectsFromConfig({
-        routesConfig: finalRouteConfig,
-        ssrMode
+        routesConfig: finalRouteConfig
     }) ?? [];
     return hooks.modifyRoutes.call(routeObjects);
 }

package/dist/esm/runtime/routeTree/components.mjs

@@ -33,7 +33,7 @@ function createServerLazyImportComponent(lazyImport, fallbackComponent) {
     Component.preload = load;
     return Component;
 }
-function toRouteComponent(routeObject, options = {}) {
+function toRouteComponent(routeObject) {
     const route = routeObject;
     const lazyImport = 'function' == typeof route.lazyImport ? route.lazyImport : void 0;
     const routeComponent = route.Component || route.component;

package/dist/esm/runtime/routeTree/construction.mjs

@@ -1,10 +1,11 @@
 import { DefaultNotFound } from "@modern-js/runtime/context";
 import { rootRouteId } from "@tanstack/react-router";
+import { createRouteStaticData } from "../../shared/routeStaticData.mjs";
 import { withModernRouteMatchContext } from "../outlet.mjs";
 import { toErrorComponent, toPendingComponent, toRouteComponent } from "./components.mjs";
 import { createModernShouldReload, wrapRouteObjectLoader } from "./loaders.mjs";
 import { isRouteObjectPathlessLayout, toTanstackPath } from "./paths.mjs";
-import { createRouteStaticData, mergeModernRouteHandle } from "./staticData.mjs";
+import { mergeModernRouteHandle } from "./staticData.mjs";
 import { createTanstackRootRoute, createTanstackRoute, wrapRouteComponentWithModernContext } from "./tanstackRoutes.mjs";
 function createRouteFromRouteObject(opts) {
     const { options = {}, parent, pathlessFallbackId = 'pathless', routeObject } = opts;
@@ -13,7 +14,7 @@ function createRouteFromRouteObject(opts) {
     const shouldRevalidate = modernRouteObject.shouldRevalidate;
     const shouldReload = createModernShouldReload(shouldRevalidate, revalidationState);
     const stableFallbackId = routeObject.id || modernRouteObject.file || pathlessFallbackId;
-    const component = toRouteComponent(routeObject, options);
+    const component = toRouteComponent(routeObject);
     const base = {
         getParentRoute: ()=>parent,
         component,

package/dist/esm/runtime/routeTree/loaders.mjs

@@ -1,5 +1,4 @@
-import { notFound } from "@tanstack/react-router";
-import { isRedirectResponse, isResponse, isTanstackRedirect, throwTanstackRedirect } from "../loaderBridge.mjs";
+import { getLoaderHref, handleModernLoaderError, handleModernLoaderResult, mapSplatParamsForModernLoader } from "../loaderBridge.mjs";
 import { isTanstackRscPayloadNavigationEnabled, loadTanstackRscRouteData } from "../rsc/payloadRouter.mjs";
 function isModernDeferredData(value) {
     if (!value || 'object' != typeof value) return false;
@@ -10,22 +9,10 @@ function normalizeModernLoaderResult(result) {
     return isModernDeferredData(result) ? result.data : result;
 }
 function normalizeModernLoaderResponse(result) {
-    if (isResponse(result)) {
-        if (isRedirectResponse(result)) {
-            const location = result.headers.get('Location') || '/';
-            throwTanstackRedirect(location);
-        }
-        if (404 === result.status) throw notFound();
-    }
-    return normalizeModernLoaderResult(result);
-}
-function createModernRequest(input, signal) {
-    return new Request(input, {
-        signal
-    });
+    return normalizeModernLoaderResult(handleModernLoaderResult(result));
 }
 function getModernUrlFromLoaderContext(ctx) {
-    const href = 'string' == typeof ctx?.location ? ctx.location : ctx?.location?.publicHref || ctx?.location?.href || ctx?.location?.url?.href || '/';
+    const href = getLoaderHref(ctx) || '/';
     const baseRequest = ctx?.context?.request instanceof Request ? ctx.context.request : void 0;
     const baseUrl = baseRequest?.url || ("u" > typeof window ? window.origin : 'http://localhost');
     return new URL(href || '/', baseUrl);
@@ -52,20 +39,6 @@ function createModernShouldReload(shouldRevalidate, state) {
         return 'boolean' == typeof result ? result : void 0;
     };
 }
-function isRouteObjectSplatRoute(route) {
-    return 'string' == typeof route.path && route.path.includes('*');
-}
-function mapParamsForRouteObjectLoader({ route, params }) {
-    if (isRouteObjectSplatRoute(route)) {
-        const { _splat, ...rest } = params;
-        if (void 0 !== _splat) return {
-            ...rest,
-            '*': _splat
-        };
-        return rest;
-    }
-    return params;
-}
 function wrapRouteObjectLoader(route, revalidationState, options = {}) {
     const modernRoute = route;
     const routeLoader = modernRoute.loader;
@@ -78,14 +51,13 @@ function wrapRouteObjectLoader(route, revalidationState, options = {}) {
             } catch  {}
             const signal = ctx?.abortController?.signal || ctx?.signal || new AbortController().signal;
             const baseRequest = ctx?.context?.request instanceof Request ? ctx.context.request : void 0;
-            const href = 'string' == typeof ctx?.location ? ctx.location : ctx?.location?.publicHref || ctx?.location?.href || ctx?.location?.url?.href || '';
+            const href = getLoaderHref(ctx);
             const request = void 0 !== baseRequest ? new Request(baseRequest, {
                 signal
-            }) : createModernRequest(href, signal);
-            const params = mapParamsForRouteObjectLoader({
-                route,
-                params: ctx.params || {}
+            }) : new Request(href, {
+                signal
             });
+            const params = mapSplatParamsForModernLoader(ctx.params || {}, 'string' == typeof route.path && route.path.includes('*'));
             const loadModernData = async ()=>{
                 const result = await routeLoader({
                     request,
@@ -102,15 +74,7 @@ function wrapRouteObjectLoader(route, revalidationState, options = {}) {
             });
             return loadModernData();
         } catch (err) {
-            if (isResponse(err)) {
-                if (isTanstackRedirect(err)) throw err;
-                if (isRedirectResponse(err)) {
-                    const location = err.headers.get('Location') || '/';
-                    throwTanstackRedirect(location);
-                }
-                if (404 === err.status) throw notFound();
-            }
-            throw err;
+            handleModernLoaderError(err);
         }
     };
 }

package/dist/esm/runtime/routeTree/staticData.mjs

@@ -6,17 +6,4 @@ function mergeModernRouteHandle(route) {
     };
     return Object.keys(handle).length > 0 ? handle : void 0;
 }
-function createRouteStaticData(opts) {
-    const staticData = {};
-    if (opts.modernRouteId) staticData.modernRouteId = opts.modernRouteId;
-    if (opts.modernRouteAction) staticData.modernRouteAction = opts.modernRouteAction;
-    if (opts.modernRouteHandle) staticData.modernRouteHandle = opts.modernRouteHandle;
-    if (opts.modernRouteHasAction) staticData.modernRouteHasAction = true;
-    if (opts.modernRouteHasClientLoader) staticData.modernRouteHasClientLoader = true;
-    if (opts.modernRouteHasLoader) staticData.modernRouteHasLoader = true;
-    if (opts.modernRouteIsClientComponent) staticData.modernRouteIsClientComponent = true;
-    if (opts.modernRouteLoader) staticData.modernRouteLoader = opts.modernRouteLoader;
-    if (opts.modernRouteShouldRevalidate) staticData.modernRouteShouldRevalidate = opts.modernRouteShouldRevalidate;
-    return Object.keys(staticData).length > 0 ? staticData : void 0;
-}
-export { createRouteStaticData, mergeModernRouteHandle };
+export { mergeModernRouteHandle };

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

@@ -28,6 +28,5 @@ function getTanstackRscSerializationAdapters() {
         adapter
     ];
 }
-const rscSerializationAdapter = getTanstackRscSerializationAdapters;
 export { CompositeComponent } from "./CompositeComponent.mjs";
-export { createTanstackRscValueFromFlight, getTanstackRscSerializationAdapters, rscSerializationAdapter };
+export { createTanstackRscValueFromFlight, getTanstackRscSerializationAdapters };

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

@@ -115,7 +115,6 @@ function getTanstackRscSerializationAdapters() {
         adapter
     ];
 }
-const rscSerializationAdapter = getTanstackRscSerializationAdapters;
 function createReadableStreamEmitter() {
     let closed = false;
     const queue = [];
@@ -193,4 +192,4 @@ function wrapReadableStream(source, handlers) {
     });
 }
 export { CompositeComponent } from "./CompositeComponent.mjs";
-export { createCompositeComponent, getTanstackRscSerializationAdapters, renderServerComponent, rscSerializationAdapter };
+export { createCompositeComponent, getTanstackRscSerializationAdapters, renderServerComponent };

package/dist/esm/runtime/submitAction.mjs

@@ -1,4 +1,5 @@
 import { formDataToTextPlain, formDataToUrlSearchParams, toFormData } from "./formData.mjs";
+import { isRedirectResponse } from "./loaderBridge.mjs";
 class RouteActionResponseError extends Error {
     constructor(response, data){
         super(`Route action failed with status ${response.status}`);
@@ -22,16 +23,6 @@ function resolveRouteHandlers(router, actionTo) {
         params: routeParams
     };
 }
-function isRedirectResponse(value) {
-    if (!(value instanceof Response)) return false;
-    return [
-        301,
-        302,
-        303,
-        307,
-        308
-    ].includes(value.status);
-}
 async function parseResponseData(response) {
     if (204 === response.status) return null;
     const contentType = response.headers.get('Content-Type') || '';

package/dist/esm/runtime/utils.mjs

@@ -1,5 +1,6 @@
 import { jsx } from "react/jsx-runtime";
 import react from "react";
+import { mergeModernRouteHandle } from "./routeTree/staticData.mjs";
 function withGlobalLayout(Component, globalApp) {
     if (!globalApp) return Component;
     const GlobalLayout = globalApp;
@@ -10,12 +11,6 @@ function withGlobalLayout(Component, globalApp) {
         });
     };
 }
-function getRouteHandle(route) {
-    return {
-        ...route.handle,
-        ...'object' == typeof route.config ? route.config?.handle : {}
-    };
-}
 function toTanstackRouteObject(route, globalApp) {
     if ('nested' === route.type) return {
         path: route.path,
@@ -23,7 +18,7 @@ function toTanstackRouteObject(route, globalApp) {
         loader: route.loader,
         action: route.action,
         shouldRevalidate: route.shouldRevalidate,
-        handle: getRouteHandle(route),
+        handle: mergeModernRouteHandle(route) ?? {},
         index: route.index,
         hasLoader: route.hasLoader || Boolean(route.loader),
         hasClientLoader: route.hasClientLoader || Boolean(route.clientData),

package/dist/esm/shared/routeStaticData.mjs

@@ -0,0 +1,4 @@
+function createRouteStaticData(opts) {
+    return Object.fromEntries(Object.entries(opts).filter(([, value])=>Boolean(value)));
+}
+export { createRouteStaticData };

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

@@ -1,6 +1,7 @@
 import "node:module";
 import { getPathWithoutExt } from "@modern-js/runtime/cli";
 import { findExists, formatImportPath, slash } from "@modern-js/utils";
+import { createRouteStaticData } from "../../shared/routeStaticData.mjs";
 const JS_OR_TS_EXTS = [
     '.js',
     '.jsx',
@@ -51,12 +52,13 @@ function isIndexRoute(route) {
     return 'nested' === extras.type && Boolean(extras.index);
 }
 function createRouteStaticDataSnippet(opts) {
-    const staticDataLines = [];
-    if (opts.modernRouteId) staticDataLines.push(`modernRouteId: ${quote(opts.modernRouteId)},`);
-    if (opts.loaderName) staticDataLines.push(`modernRouteLoader: ${opts.loaderName},`);
-    if (opts.actionName) staticDataLines.push(`modernRouteAction: ${opts.actionName},`);
-    if (!staticDataLines.length) return null;
-    return `staticData: createRouteStaticData({\n    ${staticDataLines.join('\n    ')}\n  }),`;
+    const staticData = createRouteStaticData({
+        modernRouteId: opts.modernRouteId && quote(opts.modernRouteId),
+        modernRouteLoader: opts.loaderName,
+        modernRouteAction: opts.actionName
+    });
+    const entries = Object.entries(staticData);
+    return entries.length > 0 ? `staticData: createRouteStaticData({\n    ${entries.map(([key, value])=>`${key}: ${value},`).join('\n    ')}\n  }),` : null;
 }
 export { toTanstackPath } from "../../runtime/routeTree/paths.mjs";
 export { createRouteStaticDataSnippet, isIndexRoute, isPathlessLayout, normalizeRelativeImport, pickModernLoaderModule, pickRouteSearchContractModules, quote, resolveFileNoExt };

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

@@ -2,7 +2,7 @@ import "node:module";
 import { RouterProvider } from "@tanstack/react-router";
 import { createElement } from "react";
 import { withModernRouteMatchContext } from "./outlet.mjs";
-import { pickRouteModuleComponent } from "./routeTree.mjs";
+import { pickRouteModuleComponent } from "./routeTree/index.mjs";
 const routerHydrationRecords = new WeakMap();
 const routeModulesKey = '_routeModules';
 function getCachedRouteModule(routeId) {

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

@@ -36,13 +36,6 @@ function mapSplatParamsForModernLoader(params, hasSplat) {
     };
     return rest;
 }
-function createRouteStaticData(opts) {
-    const staticData = {};
-    if ('string' == typeof opts.modernRouteId && opts.modernRouteId.length > 0) staticData.modernRouteId = opts.modernRouteId;
-    if (void 0 !== opts.modernRouteLoader) staticData.modernRouteLoader = opts.modernRouteLoader;
-    if (void 0 !== opts.modernRouteAction) staticData.modernRouteAction = opts.modernRouteAction;
-    return staticData;
-}
 function getLoaderSignal(ctx) {
     const abortSignal = ctx?.abortController?.signal;
     if (abortSignal instanceof AbortSignal) return abortSignal;
@@ -108,4 +101,5 @@ function modernLoaderToTanstack(opts, modernLoader) {
         }
     };
 }
-export { createRouteStaticData, isAbsoluteUrl, isRedirectResponse, isResponse, isTanstackRedirect, mapSplatParamsForModernLoader, modernLoaderToTanstack, throwTanstackRedirect };
+export { createRouteStaticData } from "../shared/routeStaticData.mjs";
+export { getLoaderHref, handleModernLoaderError, handleModernLoaderResult, isAbsoluteUrl, isRedirectResponse, isResponse, isTanstackRedirect, mapSplatParamsForModernLoader, modernLoaderToTanstack, throwTanstackRedirect };

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

@@ -14,7 +14,7 @@ import { applyRouterRuntimeState } from "./lifecycle.mjs";
 import { createTanstackRouteObjects, getMergedRouterConfig, getTanstackRouteConfig, joinBasename } from "./pluginShared.mjs";
 import { Link } from "./prefetchLink.mjs";
 import { useMatches } from "./routeHooks.mjs";
-import { createRouteTreeFromRouteObjects } from "./routeTree.mjs";
+import { createRouteTreeFromRouteObjects } from "./routeTree/index.mjs";
 import { getTanstackRscSerializationAdapters } from "./rsc/client.mjs";
 import { getModernTanstackRouterFastDefaults } from "./types.mjs";
 const tanstackRouterPlugin = (userConfig = {})=>{
@@ -127,7 +127,7 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                 if (hasSSRBootstrap && getRouteObjects().length > 0) {
                     const runtimeContext = context;
                     const router = getRouter(runtimeContext, getClientBasename(runtimeContext));
-                    if (null != router) return getTanstackSsrHydrationPromise(router).then(()=>void 0);
+                    if (router) return getTanstackSsrHydrationPromise(router).then(()=>void 0);
                 }
             });
             api.wrapRoot((App)=>{
@@ -157,20 +157,19 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                         router
                     };
                     const hasSSRBootstrap = "u" > typeof window && (Boolean(window.$_TSR) || hasTanstackSsrHydrationRecord(router));
-                    const needsRouterClient = hasSSRBootstrap;
-                    if (needsRouterClient) hooks.onBeforeHydrateRouter.call({
+                    if (hasSSRBootstrap) hooks.onBeforeHydrateRouter.call({
                         ...lifecycleContext,
                         phase: 'hydrate',
                         router,
                         runtimeContext: runtimeState
                     });
-                    const RouterContent = needsRouterClient ? /*#__PURE__*/ jsx(ModernRouterClient, {
+                    const RouterContent = hasSSRBootstrap ? /*#__PURE__*/ jsx(ModernRouterClient, {
                         router: router
                     }) : /*#__PURE__*/ jsx(RouterProvider, {
                         router: router
                     });
                     const HydratableRouterContent = wrapTanstackSsrHydrationBoundary(RouterContent, hasSSRBootstrap);
-                    if (needsRouterClient) hooks.onAfterHydrateRouter.call({
+                    if (hasSSRBootstrap) hooks.onAfterHydrateRouter.call({
                         ...lifecycleContext,
                         phase: 'hydrate',
                         router,

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

@@ -11,7 +11,7 @@ import { routerProviderRegistryHooks } from "./hooks.mjs";
 import { wrapTanstackSsrHydrationBoundary } from "./hydrationBoundary.mjs";
 import { applyRouterServerPrepareResult, createRouterServerSnapshot, getRouterRuntimeState } from "./lifecycle.mjs";
 import { createTanstackRouteObjects, getTanstackRouteConfig, joinBasename } from "./pluginShared.mjs";
-import { createRouteTreeFromRouteObjects, getModernRouteIdsFromMatches } from "./routeTree.mjs";
+import { createRouteTreeFromRouteObjects, getModernRouteIdsFromMatches } from "./routeTree/index.mjs";
 import { createTanstackRscServerPayload, handleTanstackRscRedirect } from "./rsc/payloadRouter.mjs";
 import { getTanstackRscRouter, setTanstackRscRouter, setTanstackRscServerPayload } from "./rsc/payloadStorage.mjs";
 import { attachServerSsrUtils, collectRouterErrors, createGetSsrHref, routerManagedTagsToHtml, waitForRouterSerialization } from "./ssrManagedTags.mjs";
@@ -25,16 +25,15 @@ const tanstackRouterPlugin = (userConfig = {})=>{
             api.onBeforeRender(async (context, interrupt)=>{
                 const routeConfig = getTanstackRouteConfig(api, userConfig);
                 const { mergedConfig } = routeConfig;
-                const serializationAdapters = getGlobalEnableRsc() ? (await import("./rsc/server.mjs")).getTanstackRscSerializationAdapters() : void 0;
                 const enableRsc = getGlobalEnableRsc();
+                const serializationAdapters = enableRsc ? (await import("./rsc/server.mjs")).getTanstackRscSerializationAdapters() : void 0;
                 const { basename = '' } = mergedConfig;
                 if (!routeConfig.hasConfiguredRoutes) return;
                 const hooks = api.getHooks();
                 await hooks.onBeforeCreateRoutes.call(context);
                 const modifiedRouteObjects = createTanstackRouteObjects({
                     hooks,
-                    routeConfig,
-                    ssrMode: context.ssrContext?.mode
+                    routeConfig
                 });
                 if (!modifiedRouteObjects.length) return;
                 const { request, nonce, baseUrl, loaderFailureMode = 'errorBoundary' } = context.ssrContext;

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

@@ -22,11 +22,10 @@ function getTanstackRouteConfig(api, userConfig) {
         hasConfiguredRoutes: Boolean(finalRouteConfig.routes) || Boolean(mergedConfig.createRoutes)
     };
 }
-function createTanstackRouteObjects({ hooks, routeConfig, ssrMode }) {
+function createTanstackRouteObjects({ hooks, routeConfig }) {
     const { mergedConfig, finalRouteConfig } = routeConfig;
     const routeObjects = void 0 !== mergedConfig.createRoutes ? mergedConfig.createRoutes() : createTanstackRouteObjectsFromConfig({
-        routesConfig: finalRouteConfig,
-        ssrMode
+        routesConfig: finalRouteConfig
     }) ?? [];
     return hooks.modifyRoutes.call(routeObjects);
 }

package/dist/esm-node/runtime/routeTree/components.mjs

@@ -34,7 +34,7 @@ function createServerLazyImportComponent(lazyImport, fallbackComponent) {
     Component.preload = load;
     return Component;
 }
-function toRouteComponent(routeObject, options = {}) {
+function toRouteComponent(routeObject) {
     const route = routeObject;
     const lazyImport = 'function' == typeof route.lazyImport ? route.lazyImport : void 0;
     const routeComponent = route.Component || route.component;

package/dist/esm-node/runtime/routeTree/construction.mjs

@@ -1,11 +1,12 @@
 import "node:module";
 import { DefaultNotFound } from "@modern-js/runtime/context";
 import { rootRouteId } from "@tanstack/react-router";
+import { createRouteStaticData } from "../../shared/routeStaticData.mjs";
 import { withModernRouteMatchContext } from "../outlet.mjs";
 import { toErrorComponent, toPendingComponent, toRouteComponent } from "./components.mjs";
 import { createModernShouldReload, wrapRouteObjectLoader } from "./loaders.mjs";
 import { isRouteObjectPathlessLayout, toTanstackPath } from "./paths.mjs";
-import { createRouteStaticData, mergeModernRouteHandle } from "./staticData.mjs";
+import { mergeModernRouteHandle } from "./staticData.mjs";
 import { createTanstackRootRoute, createTanstackRoute, wrapRouteComponentWithModernContext } from "./tanstackRoutes.mjs";
 function createRouteFromRouteObject(opts) {
     const { options = {}, parent, pathlessFallbackId = 'pathless', routeObject } = opts;
@@ -14,7 +15,7 @@ function createRouteFromRouteObject(opts) {
     const shouldRevalidate = modernRouteObject.shouldRevalidate;
     const shouldReload = createModernShouldReload(shouldRevalidate, revalidationState);
     const stableFallbackId = routeObject.id || modernRouteObject.file || pathlessFallbackId;
-    const component = toRouteComponent(routeObject, options);
+    const component = toRouteComponent(routeObject);
     const base = {
         getParentRoute: ()=>parent,
         component,

package/dist/esm-node/runtime/routeTree/loaders.mjs

@@ -1,6 +1,5 @@
 import "node:module";
-import { notFound } from "@tanstack/react-router";
-import { isRedirectResponse, isResponse, isTanstackRedirect, throwTanstackRedirect } from "../loaderBridge.mjs";
+import { getLoaderHref, handleModernLoaderError, handleModernLoaderResult, mapSplatParamsForModernLoader } from "../loaderBridge.mjs";
 import { isTanstackRscPayloadNavigationEnabled, loadTanstackRscRouteData } from "../rsc/payloadRouter.mjs";
 function isModernDeferredData(value) {
     if (!value || 'object' != typeof value) return false;
@@ -11,22 +10,10 @@ function normalizeModernLoaderResult(result) {
     return isModernDeferredData(result) ? result.data : result;
 }
 function normalizeModernLoaderResponse(result) {
-    if (isResponse(result)) {
-        if (isRedirectResponse(result)) {
-            const location = result.headers.get('Location') || '/';
-            throwTanstackRedirect(location);
-        }
-        if (404 === result.status) throw notFound();
-    }
-    return normalizeModernLoaderResult(result);
-}
-function createModernRequest(input, signal) {
-    return new Request(input, {
-        signal
-    });
+    return normalizeModernLoaderResult(handleModernLoaderResult(result));
 }
 function getModernUrlFromLoaderContext(ctx) {
-    const href = 'string' == typeof ctx?.location ? ctx.location : ctx?.location?.publicHref || ctx?.location?.href || ctx?.location?.url?.href || '/';
+    const href = getLoaderHref(ctx) || '/';
     const baseRequest = ctx?.context?.request instanceof Request ? ctx.context.request : void 0;
     const baseUrl = baseRequest?.url || ("u" > typeof window ? window.origin : 'http://localhost');
     return new URL(href || '/', baseUrl);
@@ -53,20 +40,6 @@ function createModernShouldReload(shouldRevalidate, state) {
         return 'boolean' == typeof result ? result : void 0;
     };
 }
-function isRouteObjectSplatRoute(route) {
-    return 'string' == typeof route.path && route.path.includes('*');
-}
-function mapParamsForRouteObjectLoader({ route, params }) {
-    if (isRouteObjectSplatRoute(route)) {
-        const { _splat, ...rest } = params;
-        if (void 0 !== _splat) return {
-            ...rest,
-            '*': _splat
-        };
-        return rest;
-    }
-    return params;
-}
 function wrapRouteObjectLoader(route, revalidationState, options = {}) {
     const modernRoute = route;
     const routeLoader = modernRoute.loader;
@@ -79,14 +52,13 @@ function wrapRouteObjectLoader(route, revalidationState, options = {}) {
             } catch  {}
             const signal = ctx?.abortController?.signal || ctx?.signal || new AbortController().signal;
             const baseRequest = ctx?.context?.request instanceof Request ? ctx.context.request : void 0;
-            const href = 'string' == typeof ctx?.location ? ctx.location : ctx?.location?.publicHref || ctx?.location?.href || ctx?.location?.url?.href || '';
+            const href = getLoaderHref(ctx);
             const request = void 0 !== baseRequest ? new Request(baseRequest, {
                 signal
-            }) : createModernRequest(href, signal);
-            const params = mapParamsForRouteObjectLoader({
-                route,
-                params: ctx.params || {}
+            }) : new Request(href, {
+                signal
             });
+            const params = mapSplatParamsForModernLoader(ctx.params || {}, 'string' == typeof route.path && route.path.includes('*'));
             const loadModernData = async ()=>{
                 const result = await routeLoader({
                     request,
@@ -103,15 +75,7 @@ function wrapRouteObjectLoader(route, revalidationState, options = {}) {
             });
             return loadModernData();
         } catch (err) {
-            if (isResponse(err)) {
-                if (isTanstackRedirect(err)) throw err;
-                if (isRedirectResponse(err)) {
-                    const location = err.headers.get('Location') || '/';
-                    throwTanstackRedirect(location);
-                }
-                if (404 === err.status) throw notFound();
-            }
-            throw err;
+            handleModernLoaderError(err);
         }
     };
 }

package/dist/esm-node/runtime/routeTree/staticData.mjs

@@ -7,17 +7,4 @@ function mergeModernRouteHandle(route) {
     };
     return Object.keys(handle).length > 0 ? handle : void 0;
 }
-function createRouteStaticData(opts) {
-    const staticData = {};
-    if (opts.modernRouteId) staticData.modernRouteId = opts.modernRouteId;
-    if (opts.modernRouteAction) staticData.modernRouteAction = opts.modernRouteAction;
-    if (opts.modernRouteHandle) staticData.modernRouteHandle = opts.modernRouteHandle;
-    if (opts.modernRouteHasAction) staticData.modernRouteHasAction = true;
-    if (opts.modernRouteHasClientLoader) staticData.modernRouteHasClientLoader = true;
-    if (opts.modernRouteHasLoader) staticData.modernRouteHasLoader = true;
-    if (opts.modernRouteIsClientComponent) staticData.modernRouteIsClientComponent = true;
-    if (opts.modernRouteLoader) staticData.modernRouteLoader = opts.modernRouteLoader;
-    if (opts.modernRouteShouldRevalidate) staticData.modernRouteShouldRevalidate = opts.modernRouteShouldRevalidate;
-    return Object.keys(staticData).length > 0 ? staticData : void 0;
-}
-export { createRouteStaticData, mergeModernRouteHandle };
+export { mergeModernRouteHandle };

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

@@ -29,6 +29,5 @@ function getTanstackRscSerializationAdapters() {
         adapter
     ];
 }
-const rscSerializationAdapter = getTanstackRscSerializationAdapters;
 export { CompositeComponent } from "./CompositeComponent.mjs";
-export { createTanstackRscValueFromFlight, getTanstackRscSerializationAdapters, rscSerializationAdapter };
+export { createTanstackRscValueFromFlight, getTanstackRscSerializationAdapters };

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

@@ -116,7 +116,6 @@ function getTanstackRscSerializationAdapters() {
         adapter
     ];
 }
-const rscSerializationAdapter = getTanstackRscSerializationAdapters;
 function createReadableStreamEmitter() {
     let closed = false;
     const queue = [];
@@ -194,4 +193,4 @@ function wrapReadableStream(source, handlers) {
     });
 }
 export { CompositeComponent } from "./CompositeComponent.mjs";
-export { createCompositeComponent, getTanstackRscSerializationAdapters, renderServerComponent, rscSerializationAdapter };
+export { createCompositeComponent, getTanstackRscSerializationAdapters, renderServerComponent };