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

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

@@ -40,6 +40,7 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const cli_namespaceObject = require("@modern-js/runtime/cli");
 const utils_namespaceObject = require("@modern-js/utils");
+const routeStaticData_js_namespaceObject = require("../../shared/routeStaticData.js");
 const paths_js_namespaceObject = require("../../runtime/routeTree/paths.js");
 const JS_OR_TS_EXTS = [
     '.js',
@@ -91,12 +92,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 = (0, routeStaticData_js_namespaceObject.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;
 }
 exports.createRouteStaticDataSnippet = __webpack_exports__.createRouteStaticDataSnippet;
 exports.isIndexRoute = __webpack_exports__.isIndexRoute;

package/dist/cjs/runtime/clientHydration.js

@@ -36,7 +36,7 @@ __webpack_require__.d(__webpack_exports__, {
 const react_router_namespaceObject = require("@tanstack/react-router");
 const external_react_namespaceObject = require("react");
 const external_outlet_js_namespaceObject = require("./outlet.js");
-const external_routeTree_js_namespaceObject = require("./routeTree.js");
+const index_js_namespaceObject = require("./routeTree/index.js");
 const routerHydrationRecords = new WeakMap();
 const routeModulesKey = '_routeModules';
 function getCachedRouteModule(routeId) {
@@ -56,7 +56,7 @@ function preloadHydratedRouteComponents(router) {
         return Promise.resolve(preload.call(component)).then((routeModule)=>{
             const modernRouteId = route?.options?.staticData?.modernRouteId;
             const cachedRouteModule = 'string' == typeof modernRouteId && '' !== modernRouteId ? getCachedRouteModule(modernRouteId) : void 0;
-            const resolvedComponent = (0, external_routeTree_js_namespaceObject.pickRouteModuleComponent)(cachedRouteModule ?? routeModule);
+            const resolvedComponent = (0, index_js_namespaceObject.pickRouteModuleComponent)(cachedRouteModule ?? routeModule);
             if (void 0 !== resolvedComponent && 'string' == typeof modernRouteId && '' !== modernRouteId) route.options.component = (0, external_outlet_js_namespaceObject.withModernRouteMatchContext)(resolvedComponent, modernRouteId);
         });
     })).then(()=>void 0);

package/dist/cjs/runtime/loaderBridge.js

@@ -28,7 +28,10 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    createRouteStaticData: ()=>createRouteStaticData,
+    createRouteStaticData: ()=>routeStaticData_js_namespaceObject.createRouteStaticData,
+    getLoaderHref: ()=>getLoaderHref,
+    handleModernLoaderError: ()=>handleModernLoaderError,
+    handleModernLoaderResult: ()=>handleModernLoaderResult,
     isAbsoluteUrl: ()=>isAbsoluteUrl_js_namespaceObject.isAbsoluteUrl,
     isRedirectResponse: ()=>isRedirectResponse,
     isResponse: ()=>isResponse,
@@ -38,6 +41,7 @@ __webpack_require__.d(__webpack_exports__, {
     throwTanstackRedirect: ()=>throwTanstackRedirect
 });
 const react_router_namespaceObject = require("@tanstack/react-router");
+const routeStaticData_js_namespaceObject = require("../shared/routeStaticData.js");
 const isAbsoluteUrl_js_namespaceObject = require("./shared/isAbsoluteUrl.js");
 function isResponse(value) {
     const record = value;
@@ -74,13 +78,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;
@@ -147,6 +144,9 @@ function modernLoaderToTanstack(opts, modernLoader) {
     };
 }
 exports.createRouteStaticData = __webpack_exports__.createRouteStaticData;
+exports.getLoaderHref = __webpack_exports__.getLoaderHref;
+exports.handleModernLoaderError = __webpack_exports__.handleModernLoaderError;
+exports.handleModernLoaderResult = __webpack_exports__.handleModernLoaderResult;
 exports.isAbsoluteUrl = __webpack_exports__.isAbsoluteUrl;
 exports.isRedirectResponse = __webpack_exports__.isRedirectResponse;
 exports.isResponse = __webpack_exports__.isResponse;
@@ -156,6 +156,9 @@ exports.modernLoaderToTanstack = __webpack_exports__.modernLoaderToTanstack;
 exports.throwTanstackRedirect = __webpack_exports__.throwTanstackRedirect;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "createRouteStaticData",
+    "getLoaderHref",
+    "handleModernLoaderError",
+    "handleModernLoaderResult",
     "isAbsoluteUrl",
     "isRedirectResponse",
     "isResponse",

package/dist/cjs/runtime/plugin.js

@@ -46,7 +46,7 @@ const external_lifecycle_js_namespaceObject = require("./lifecycle.js");
 const external_pluginShared_js_namespaceObject = require("./pluginShared.js");
 const external_prefetchLink_js_namespaceObject = require("./prefetchLink.js");
 const external_routeHooks_js_namespaceObject = require("./routeHooks.js");
-const external_routeTree_js_namespaceObject = require("./routeTree.js");
+const index_js_namespaceObject = require("./routeTree/index.js");
 const client_js_namespaceObject = require("./rsc/client.js");
 const external_types_js_namespaceObject = require("./types.js");
 const tanstackRouterPlugin = (userConfig = {})=>{
@@ -72,7 +72,7 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                 if (cachedRouteTree) return cachedRouteTree;
                 const routeObjects = getRouteObjects();
                 if (!routeObjects.length) return null;
-                cachedRouteTree = (0, external_routeTree_js_namespaceObject.createRouteTreeFromRouteObjects)(routeObjects, {
+                cachedRouteTree = (0, index_js_namespaceObject.createRouteTreeFromRouteObjects)(routeObjects, {
                     rscPayloadRouter: (0, context_namespaceObject.getGlobalEnableRsc)()
                 });
                 return cachedRouteTree;
@@ -159,7 +159,7 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                 if (hasSSRBootstrap && getRouteObjects().length > 0) {
                     const runtimeContext = context;
                     const router = getRouter(runtimeContext, getClientBasename(runtimeContext));
-                    if (null != router) return (0, external_clientHydration_js_namespaceObject.getTanstackSsrHydrationPromise)(router).then(()=>void 0);
+                    if (router) return (0, external_clientHydration_js_namespaceObject.getTanstackSsrHydrationPromise)(router).then(()=>void 0);
                 }
             });
             api.wrapRoot((App)=>{
@@ -189,20 +189,19 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                         router
                     };
                     const hasSSRBootstrap = "u" > typeof window && (Boolean(window.$_TSR) || (0, external_clientHydration_js_namespaceObject.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__*/ (0, jsx_runtime_namespaceObject.jsx)(external_clientHydration_js_namespaceObject.ModernRouterClient, {
+                    const RouterContent = hasSSRBootstrap ? /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_clientHydration_js_namespaceObject.ModernRouterClient, {
                         router: router
                     }) : /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(react_router_namespaceObject.RouterProvider, {
                         router: router
                     });
                     const HydratableRouterContent = (0, external_hydrationBoundary_js_namespaceObject.wrapTanstackSsrHydrationBoundary)(RouterContent, hasSSRBootstrap);
-                    if (needsRouterClient) hooks.onAfterHydrateRouter.call({
+                    if (hasSSRBootstrap) hooks.onAfterHydrateRouter.call({
                         ...lifecycleContext,
                         phase: 'hydrate',
                         router,

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

@@ -43,7 +43,7 @@ const external_hooks_js_namespaceObject = require("./hooks.js");
 const external_hydrationBoundary_js_namespaceObject = require("./hydrationBoundary.js");
 const external_lifecycle_js_namespaceObject = require("./lifecycle.js");
 const external_pluginShared_js_namespaceObject = require("./pluginShared.js");
-const external_routeTree_js_namespaceObject = require("./routeTree.js");
+const index_js_namespaceObject = require("./routeTree/index.js");
 const payloadRouter_js_namespaceObject = require("./rsc/payloadRouter.js");
 const payloadStorage_js_namespaceObject = require("./rsc/payloadStorage.js");
 const external_ssrManagedTags_js_namespaceObject = require("./ssrManagedTags.js");
@@ -57,16 +57,15 @@ const tanstackRouterPlugin = (userConfig = {})=>{
             api.onBeforeRender(async (context, interrupt)=>{
                 const routeConfig = (0, external_pluginShared_js_namespaceObject.getTanstackRouteConfig)(api, userConfig);
                 const { mergedConfig } = routeConfig;
-                const serializationAdapters = (0, context_namespaceObject.getGlobalEnableRsc)() ? (await import("./rsc/server.js")).getTanstackRscSerializationAdapters() : void 0;
                 const enableRsc = (0, context_namespaceObject.getGlobalEnableRsc)();
+                const serializationAdapters = enableRsc ? (await import("./rsc/server.js")).getTanstackRscSerializationAdapters() : void 0;
                 const { basename = '' } = mergedConfig;
                 if (!routeConfig.hasConfiguredRoutes) return;
                 const hooks = api.getHooks();
                 await hooks.onBeforeCreateRoutes.call(context);
                 const modifiedRouteObjects = (0, external_pluginShared_js_namespaceObject.createTanstackRouteObjects)({
                     hooks,
-                    routeConfig,
-                    ssrMode: context.ssrContext?.mode
+                    routeConfig
                 });
                 if (!modifiedRouteObjects.length) return;
                 const { request, nonce, baseUrl, loaderFailureMode = 'errorBoundary' } = context.ssrContext;
@@ -85,7 +84,7 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                     request: ssrRequest,
                     requestContext
                 };
-                const routeTree = (0, external_routeTree_js_namespaceObject.createRouteTreeFromRouteObjects)(modifiedRouteObjects);
+                const routeTree = (0, index_js_namespaceObject.createRouteTreeFromRouteObjects)(modifiedRouteObjects);
                 const history = (0, react_router_namespaceObject.createMemoryHistory)({
                     initialEntries: [
                         initialHref
@@ -160,7 +159,7 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                 }
                 const ssrScriptTags = serverRouter.serverSsr?.takeBufferedScripts?.();
                 const hydrationScripts = (0, external_ssrManagedTags_js_namespaceObject.routerManagedTagsToHtml)(ssrScriptTags);
-                const matchedRouteIds = (0, external_routeTree_js_namespaceObject.getModernRouteIdsFromMatches)(serverRouter);
+                const matchedRouteIds = (0, index_js_namespaceObject.getModernRouteIdsFromMatches)(serverRouter);
                 const routerServerSnapshot = (0, external_lifecycle_js_namespaceObject.createRouterServerSnapshot)({
                     framework: 'tanstack',
                     basename: _basename,

package/dist/cjs/runtime/pluginShared.js

@@ -56,11 +56,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() : (0, external_utils_js_namespaceObject.createTanstackRouteObjectsFromConfig)({
-        routesConfig: finalRouteConfig,
-        ssrMode
+        routesConfig: finalRouteConfig
     }) ?? [];
     return hooks.modifyRoutes.call(routeObjects);
 }

package/dist/cjs/runtime/routeTree/components.js

@@ -68,7 +68,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/cjs/runtime/routeTree/construction.js

@@ -33,6 +33,7 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const context_namespaceObject = require("@modern-js/runtime/context");
 const react_router_namespaceObject = require("@tanstack/react-router");
+const routeStaticData_js_namespaceObject = require("../../shared/routeStaticData.js");
 const external_outlet_js_namespaceObject = require("../outlet.js");
 const external_components_js_namespaceObject = require("./components.js");
 const external_loaders_js_namespaceObject = require("./loaders.js");
@@ -46,7 +47,7 @@ function createRouteFromRouteObject(opts) {
     const shouldRevalidate = modernRouteObject.shouldRevalidate;
     const shouldReload = (0, external_loaders_js_namespaceObject.createModernShouldReload)(shouldRevalidate, revalidationState);
     const stableFallbackId = routeObject.id || modernRouteObject.file || pathlessFallbackId;
-    const component = (0, external_components_js_namespaceObject.toRouteComponent)(routeObject, options);
+    const component = (0, external_components_js_namespaceObject.toRouteComponent)(routeObject);
     const base = {
         getParentRoute: ()=>parent,
         component,
@@ -54,7 +55,7 @@ function createRouteFromRouteObject(opts) {
         errorComponent: (0, external_components_js_namespaceObject.toErrorComponent)(routeObject),
         validateSearch: modernRouteObject.validateSearch,
         loaderDeps: modernRouteObject.loaderDeps,
-        staticData: (0, external_staticData_js_namespaceObject.createRouteStaticData)({
+        staticData: (0, routeStaticData_js_namespaceObject.createRouteStaticData)({
             modernRouteId: routeObject.id,
             modernRouteAction: modernRouteObject.action,
             modernRouteHandle: (0, external_staticData_js_namespaceObject.mergeModernRouteHandle)(modernRouteObject),
@@ -101,7 +102,7 @@ function createRouteTreeFromRouteObjects(routes, options = {}) {
         validateSearch: rootLikeRoute?.validateSearch,
         loaderDeps: rootLikeRoute?.loaderDeps,
         notFoundComponent: context_namespaceObject.DefaultNotFound,
-        staticData: (0, external_staticData_js_namespaceObject.createRouteStaticData)({
+        staticData: (0, routeStaticData_js_namespaceObject.createRouteStaticData)({
             modernRouteId: rootLikeRoute?.id,
             modernRouteAction: rootLikeRoute?.action,
             modernRouteHandle: rootLikeRoute ? (0, external_staticData_js_namespaceObject.mergeModernRouteHandle)(rootLikeRoute) : void 0,

package/dist/cjs/runtime/routeTree/loaders.js

@@ -31,7 +31,6 @@ __webpack_require__.d(__webpack_exports__, {
     createModernShouldReload: ()=>createModernShouldReload,
     wrapRouteObjectLoader: ()=>wrapRouteObjectLoader
 });
-const react_router_namespaceObject = require("@tanstack/react-router");
 const external_loaderBridge_js_namespaceObject = require("../loaderBridge.js");
 const payloadRouter_js_namespaceObject = require("../rsc/payloadRouter.js");
 function isModernDeferredData(value) {
@@ -43,22 +42,10 @@ function normalizeModernLoaderResult(result) {
     return isModernDeferredData(result) ? result.data : result;
 }
 function normalizeModernLoaderResponse(result) {
-    if ((0, external_loaderBridge_js_namespaceObject.isResponse)(result)) {
-        if ((0, external_loaderBridge_js_namespaceObject.isRedirectResponse)(result)) {
-            const location = result.headers.get('Location') || '/';
-            (0, external_loaderBridge_js_namespaceObject.throwTanstackRedirect)(location);
-        }
-        if (404 === result.status) throw (0, react_router_namespaceObject.notFound)();
-    }
-    return normalizeModernLoaderResult(result);
-}
-function createModernRequest(input, signal) {
-    return new Request(input, {
-        signal
-    });
+    return normalizeModernLoaderResult((0, external_loaderBridge_js_namespaceObject.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 = (0, external_loaderBridge_js_namespaceObject.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);
@@ -85,20 +72,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;
@@ -111,14 +84,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 = (0, external_loaderBridge_js_namespaceObject.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 = (0, external_loaderBridge_js_namespaceObject.mapSplatParamsForModernLoader)(ctx.params || {}, 'string' == typeof route.path && route.path.includes('*'));
             const loadModernData = async ()=>{
                 const result = await routeLoader({
                     request,
@@ -135,15 +107,7 @@ function wrapRouteObjectLoader(route, revalidationState, options = {}) {
             });
             return loadModernData();
         } catch (err) {
-            if ((0, external_loaderBridge_js_namespaceObject.isResponse)(err)) {
-                if ((0, external_loaderBridge_js_namespaceObject.isTanstackRedirect)(err)) throw err;
-                if ((0, external_loaderBridge_js_namespaceObject.isRedirectResponse)(err)) {
-                    const location = err.headers.get('Location') || '/';
-                    (0, external_loaderBridge_js_namespaceObject.throwTanstackRedirect)(location);
-                }
-                if (404 === err.status) throw (0, react_router_namespaceObject.notFound)();
-            }
-            throw err;
+            (0, external_loaderBridge_js_namespaceObject.handleModernLoaderError)(err);
         }
     };
 }

package/dist/cjs/runtime/routeTree/staticData.js

@@ -35,27 +35,11 @@ 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;
-}
 __webpack_require__.d(__webpack_exports__, {
-    createRouteStaticData: ()=>createRouteStaticData,
     mergeModernRouteHandle: ()=>mergeModernRouteHandle
 });
-exports.createRouteStaticData = __webpack_exports__.createRouteStaticData;
 exports.mergeModernRouteHandle = __webpack_exports__.mergeModernRouteHandle;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
-    "createRouteStaticData",
     "mergeModernRouteHandle"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

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

@@ -31,8 +31,7 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     CompositeComponent: ()=>external_CompositeComponent_js_namespaceObject.CompositeComponent,
     createTanstackRscValueFromFlight: ()=>createTanstackRscValueFromFlight,
-    getTanstackRscSerializationAdapters: ()=>getTanstackRscSerializationAdapters,
-    rscSerializationAdapter: ()=>rscSerializationAdapter
+    getTanstackRscSerializationAdapters: ()=>getTanstackRscSerializationAdapters
 });
 const react_router_namespaceObject = require("@tanstack/react-router");
 const external_CompositeComponent_js_namespaceObject = require("./CompositeComponent.js");
@@ -64,16 +63,13 @@ function getTanstackRscSerializationAdapters() {
         adapter
     ];
 }
-const rscSerializationAdapter = getTanstackRscSerializationAdapters;
 exports.CompositeComponent = __webpack_exports__.CompositeComponent;
 exports.createTanstackRscValueFromFlight = __webpack_exports__.createTanstackRscValueFromFlight;
 exports.getTanstackRscSerializationAdapters = __webpack_exports__.getTanstackRscSerializationAdapters;
-exports.rscSerializationAdapter = __webpack_exports__.rscSerializationAdapter;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "CompositeComponent",
     "createTanstackRscValueFromFlight",
-    "getTanstackRscSerializationAdapters",
-    "rscSerializationAdapter"
+    "getTanstackRscSerializationAdapters"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true

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

@@ -31,8 +31,7 @@ __webpack_require__.d(__webpack_exports__, {
     CompositeComponent: ()=>external_CompositeComponent_js_namespaceObject.CompositeComponent,
     createCompositeComponent: ()=>createCompositeComponent,
     getTanstackRscSerializationAdapters: ()=>getTanstackRscSerializationAdapters,
-    renderServerComponent: ()=>renderServerComponent,
-    rscSerializationAdapter: ()=>rscSerializationAdapter
+    renderServerComponent: ()=>renderServerComponent
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const server_namespaceObject = require("@modern-js/runtime/rsc/server");
@@ -152,7 +151,6 @@ function getTanstackRscSerializationAdapters() {
         adapter
     ];
 }
-const rscSerializationAdapter = getTanstackRscSerializationAdapters;
 function createReadableStreamEmitter() {
     let closed = false;
     const queue = [];
@@ -233,13 +231,11 @@ exports.CompositeComponent = __webpack_exports__.CompositeComponent;
 exports.createCompositeComponent = __webpack_exports__.createCompositeComponent;
 exports.getTanstackRscSerializationAdapters = __webpack_exports__.getTanstackRscSerializationAdapters;
 exports.renderServerComponent = __webpack_exports__.renderServerComponent;
-exports.rscSerializationAdapter = __webpack_exports__.rscSerializationAdapter;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "CompositeComponent",
     "createCompositeComponent",
     "getTanstackRscSerializationAdapters",
-    "renderServerComponent",
-    "rscSerializationAdapter"
+    "renderServerComponent"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/dist/cjs/runtime/submitAction.js

@@ -32,6 +32,7 @@ __webpack_require__.d(__webpack_exports__, {
     submitRouteAction: ()=>submitRouteAction
 });
 const external_formData_js_namespaceObject = require("./formData.js");
+const external_loaderBridge_js_namespaceObject = require("./loaderBridge.js");
 class RouteActionResponseError extends Error {
     constructor(response, data){
         super(`Route action failed with status ${response.status}`);
@@ -55,16 +56,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') || '';
@@ -95,7 +86,7 @@ async function submitRouteAction({ router, target, options = {}, isFetcher = fal
             });
             if (result instanceof Response) {
                 const redirectTo = result.headers.get('X-Modernjs-Redirect') || result.headers.get('Location');
-                if (redirectTo || isRedirectResponse(result)) {
+                if (redirectTo || (0, external_loaderBridge_js_namespaceObject.isRedirectResponse)(result)) {
                     await router.navigate({
                         to: redirectTo || '/'
                     });
@@ -134,7 +125,7 @@ async function submitRouteAction({ router, target, options = {}, isFetcher = fal
     });
     if (result instanceof Response) {
         const redirectTo = result.headers.get('X-Modernjs-Redirect') || result.headers.get('Location');
-        if (redirectTo || isRedirectResponse(result)) {
+        if (redirectTo || (0, external_loaderBridge_js_namespaceObject.isRedirectResponse)(result)) {
             await router.navigate({
                 to: redirectTo || '/'
             });

package/dist/cjs/runtime/utils.js

@@ -42,6 +42,7 @@ __webpack_require__.d(__webpack_exports__, {
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const external_react_namespaceObject = require("react");
 var external_react_default = /*#__PURE__*/ __webpack_require__.n(external_react_namespaceObject);
+const staticData_js_namespaceObject = require("./routeTree/staticData.js");
 function withGlobalLayout(Component, globalApp) {
     if (!globalApp) return Component;
     const GlobalLayout = globalApp;
@@ -52,12 +53,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,
@@ -65,7 +60,7 @@ function toTanstackRouteObject(route, globalApp) {
         loader: route.loader,
         action: route.action,
         shouldRevalidate: route.shouldRevalidate,
-        handle: getRouteHandle(route),
+        handle: (0, staticData_js_namespaceObject.mergeModernRouteHandle)(route) ?? {},
         index: route.index,
         hasLoader: route.hasLoader || Boolean(route.loader),
         hasClientLoader: route.hasClientLoader || Boolean(route.clientData),

package/dist/cjs/{runtime/rsc/index.js → shared/routeStaticData.js}

@@ -27,19 +27,15 @@ var __webpack_require__ = {};
 })();
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
+function createRouteStaticData(opts) {
+    return Object.fromEntries(Object.entries(opts).filter(([, value])=>Boolean(value)));
+}
 __webpack_require__.d(__webpack_exports__, {
-    CompositeComponent: ()=>external_client_js_namespaceObject.CompositeComponent,
-    getTanstackRscSerializationAdapters: ()=>external_client_js_namespaceObject.getTanstackRscSerializationAdapters,
-    rscSerializationAdapter: ()=>external_client_js_namespaceObject.rscSerializationAdapter
+    createRouteStaticData: ()=>createRouteStaticData
 });
-const external_client_js_namespaceObject = require("./client.js");
-exports.CompositeComponent = __webpack_exports__.CompositeComponent;
-exports.getTanstackRscSerializationAdapters = __webpack_exports__.getTanstackRscSerializationAdapters;
-exports.rscSerializationAdapter = __webpack_exports__.rscSerializationAdapter;
+exports.createRouteStaticData = __webpack_exports__.createRouteStaticData;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
-    "CompositeComponent",
-    "getTanstackRscSerializationAdapters",
-    "rscSerializationAdapter"
+    "createRouteStaticData"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true

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

@@ -1,5 +1,6 @@
 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',
@@ -50,12 +51,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/runtime/clientHydration.mjs

@@ -1,7 +1,7 @@
 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/runtime/loaderBridge.mjs

@@ -35,13 +35,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;
@@ -107,4 +100,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 };