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

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

@@ -1,5 +1,6 @@
 import "node:module";
 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}`);
@@ -23,16 +24,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-node/runtime/utils.mjs

@@ -1,6 +1,7 @@
 import "node:module";
 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;
@@ -11,12 +12,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,
@@ -24,7 +19,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-node/shared/routeStaticData.mjs

@@ -0,0 +1,5 @@
+import "node:module";
+function createRouteStaticData(opts) {
+    return Object.fromEntries(Object.entries(opts).filter(([, value])=>Boolean(value)));
+}
+export { createRouteStaticData };

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

@@ -1,5 +1,6 @@
+import { createRouteStaticData } from '../shared/routeStaticData';
 import { isAbsoluteUrl } from './shared/isAbsoluteUrl';
-export { isAbsoluteUrl };
+export { createRouteStaticData, isAbsoluteUrl };
 /** Router context shape used by the generated TanStack router types. */
 export type ModernRouterContext = {
     request?: Request;
@@ -25,19 +26,22 @@ export declare function throwTanstackRedirect(location: string): never;
  * Modern loaders expect the React Router spelling.
  */
 export declare function mapSplatParamsForModernLoader(params: Record<string, string>, hasSplat: boolean): Record<string, string>;
-/**
- * Static-data factory used by the generated router files: drops empty fields
- * so route static data stays minimal.
- */
-export declare function createRouteStaticData(opts: {
-    modernRouteId?: string;
-    modernRouteAction?: unknown;
-    modernRouteLoader?: unknown;
-}): {
-    modernRouteId?: string;
-    modernRouteAction?: unknown;
-    modernRouteLoader?: unknown;
+type LoaderLikeContext = {
+    abortController?: AbortController;
+    signal?: AbortSignal;
+    context?: ModernRouterContext;
+    location?: string | {
+        publicHref?: string;
+        href?: string;
+        url?: {
+            href?: string;
+        };
+    };
+    params?: Record<string, string>;
 };
+export declare function getLoaderHref(ctx: LoaderLikeContext | undefined): string;
+export declare function handleModernLoaderResult<LoaderResult>(result: LoaderResult): LoaderResult;
+export declare function handleModernLoaderError(err: unknown): never;
 /**
  * Wrap a Modern.js data loader (`page.data.ts` loader/action style) into a
  * TanStack Router loader: builds a `Request` from the loader context, maps

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

@@ -2,7 +2,6 @@ import { type TInternalRuntimeContext } from '@modern-js/runtime/context';
 import type { RouteObject } from '@modern-js/runtime-utils/router';
 import type { RouterExtendsHooks } from './hooks';
 import type { RouterConfig } from './types';
-import { type SSRMode } from './utils';
 type TanstackRouterRuntimeConfig = {
     plugins?: TanstackRouterRuntimePlugin[];
     router?: Partial<RouterConfig>;
@@ -29,10 +28,9 @@ type TanstackRouteConfig = {
 };
 export declare function getMergedRouterConfig(api: TanstackRouterPluginAPI, userConfig: Partial<RouterConfig>): RouterConfig;
 export declare function getTanstackRouteConfig(api: TanstackRouterPluginAPI, userConfig: Partial<RouterConfig>): TanstackRouteConfig;
-export declare function createTanstackRouteObjects({ hooks, routeConfig, ssrMode, }: {
+export declare function createTanstackRouteObjects({ hooks, routeConfig, }: {
     hooks: RouterExtendsHooks;
     routeConfig: TanstackRouteConfig;
-    ssrMode?: SSRMode;
 }): RouteObject[];
 export declare function joinBasename(baseUrl: string, basename: string): string;
 export {};

package/dist/types/runtime/routeTree/components.d.ts

@@ -1,7 +1,6 @@
 import type { RouteObject } from '@modern-js/runtime-utils/router';
 import { type ElementType } from 'react';
-import type { RouteTreeOptions } from './types';
 export declare function pickRouteModuleComponent(routeModule: unknown, seen?: Set<unknown>): ElementType<Record<string, unknown>> | undefined;
-export declare function toRouteComponent(routeObject: RouteObject, options?: RouteTreeOptions): unknown;
+export declare function toRouteComponent(routeObject: RouteObject): unknown;
 export declare function toErrorComponent(routeObject: RouteObject): unknown;
 export declare function toPendingComponent(routeObject: RouteObject): unknown;

package/dist/types/runtime/routeTree/staticData.d.ts

@@ -1,19 +1,7 @@
 export declare function mergeModernRouteHandle(route: {
-    config?: {
-        handle?: Record<string, unknown>;
-    } | unknown;
+    config?: unknown;
     handle?: Record<string, unknown>;
+    [key: string]: unknown;
 }): {
     [x: string]: unknown;
 } | undefined;
-export declare function createRouteStaticData(opts: {
-    modernRouteId?: string;
-    modernRouteAction?: unknown;
-    modernRouteHandle?: unknown;
-    modernRouteHasAction?: boolean;
-    modernRouteHasClientLoader?: boolean;
-    modernRouteHasLoader?: boolean;
-    modernRouteIsClientComponent?: boolean;
-    modernRouteLoader?: unknown;
-    modernRouteShouldRevalidate?: unknown;
-}): Record<string, unknown> | undefined;

package/dist/types/runtime/rsc/client.d.ts

@@ -10,4 +10,3 @@ type SerializedRsc = {
 };
 export declare function createTanstackRscValueFromFlight(serialized: SerializedTanstackRscFlightValue): AnyCompositeComponent;
 export declare function getTanstackRscSerializationAdapters(): import("@tanstack/router-core").SerializationAdapter<AnyCompositeComponent<Record<string, unknown>, import("react").ReactNode>, SerializedRsc, never>[];
-export declare const rscSerializationAdapter: typeof getTanstackRscSerializationAdapters;

package/dist/types/runtime/rsc/server.d.ts

@@ -11,4 +11,3 @@ type SerializedRsc = {
     slotUsagesStream?: ReadableStream<RscSlotUsageEvent>;
 };
 export declare function getTanstackRscSerializationAdapters(): import("@tanstack/router-core").SerializationAdapter<AnyCompositeComponent<Record<string, unknown>, React.ReactNode> | AnyRenderableServerComponent<React.ReactNode>, SerializedRsc, never>[];
-export declare const rscSerializationAdapter: typeof getTanstackRscSerializationAdapters;

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

@@ -1,7 +1,6 @@
 import type { RouteObject } from '@modern-js/runtime-utils/router';
 import React from 'react';
 import type { ModernRoute } from './types';
-export type SSRMode = 'string' | 'stream';
 type RouterConfig = {
     routesConfig: {
         globalApp?: React.ComponentType<any>;
@@ -10,7 +9,5 @@ type RouterConfig = {
 };
 export declare function createTanstackRouteObjectsFromConfig({ routesConfig, }: {
     routesConfig: RouterConfig['routesConfig'];
-    props?: Record<string, unknown>;
-    ssrMode?: SSRMode;
 }): RouteObject[] | null;
 export {};

package/dist/types/shared/routeStaticData.d.ts

@@ -0,0 +1 @@
+export declare function createRouteStaticData<const T extends Record<string, unknown>>(opts: T): Partial<T>;

package/package.json

@@ -18,7 +18,7 @@
     "modern.js",
     "tanstack-router"
   ],
-  "version": "3.8.1-ultramodern.1",
+  "version": "3.8.1-ultramodern.3",
   "engines": {
     "node": ">=20"
   },
@@ -94,17 +94,17 @@
     }
   },
   "dependencies": {
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.8.1-ultramodern.1",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.8.1-ultramodern.1",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.8.1-ultramodern.1",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.8.1-ultramodern.1",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.8.1-ultramodern.3",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.8.1-ultramodern.3",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.8.1-ultramodern.3",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.8.1-ultramodern.3",
     "@swc/helpers": "^0.5.23",
     "@tanstack/react-router": "1.170.25",
     "@tanstack/router-core": "1.171.21"
   },
   "peerDependencies": {
-    "@modern-js/app-tools": "3.8.1-ultramodern.1",
-    "@modern-js/runtime": "3.8.1-ultramodern.1",
+    "@modern-js/app-tools": "3.8.1-ultramodern.3",
+    "@modern-js/runtime": "3.8.1-ultramodern.3",
     "react": "^19.2.8",
     "react-dom": "^19.2.8",
     "react-server-dom-rspack": "0.0.3"
@@ -115,8 +115,8 @@
     }
   },
   "devDependencies": {
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.8.1-ultramodern.1",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.8.1-ultramodern.1",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.8.1-ultramodern.3",
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.8.1-ultramodern.3",
     "@rslib/core": "0.23.2",
     "@scripts/rstest-config": "2.66.0",
     "@tanstack/history": "1.162.1",

package/src/cli/tanstackTypes/shared.ts

@@ -4,6 +4,8 @@ import { getPathWithoutExt } from '@modern-js/runtime/cli';
 import type { NestedRouteForCli, PageRoute } from '@modern-js/types';
 import { findExists, formatImportPath, slash } from '@modern-js/utils';
 
+import { createRouteStaticData } from '../../shared/routeStaticData';
+
 const JS_OR_TS_EXTS = [
   '.js',
   '.jsx',
@@ -88,25 +90,15 @@ export function createRouteStaticDataSnippet(opts: {
   loaderName?: string | null;
   actionName?: string | null;
 }) {
-  const staticDataLines: string[] = [];
-
-  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;
 }

package/src/runtime/loaderBridge.ts

@@ -9,9 +9,10 @@
  * helpers for the same reason.
  */
 import { notFound, redirect } from '@tanstack/react-router';
+import { createRouteStaticData } from '../shared/routeStaticData';
 import { isAbsoluteUrl } from './shared/isAbsoluteUrl';
 
-export { isAbsoluteUrl };
+export { createRouteStaticData, isAbsoluteUrl };
 
 /** Router context shape used by the generated TanStack router types. */
 export type ModernRouterContext = {
@@ -83,40 +84,6 @@ export function mapSplatParamsForModernLoader(
   return rest;
 }
 
-/**
- * Static-data factory used by the generated router files: drops empty fields
- * so route static data stays minimal.
- */
-export function createRouteStaticData(opts: {
-  modernRouteId?: string;
-  modernRouteAction?: unknown;
-  modernRouteLoader?: unknown;
-}): {
-  modernRouteId?: string;
-  modernRouteAction?: unknown;
-  modernRouteLoader?: unknown;
-} {
-  const staticData: {
-    modernRouteId?: string;
-    modernRouteAction?: unknown;
-    modernRouteLoader?: unknown;
-  } = {};
-
-  if (typeof opts.modernRouteId === 'string' && opts.modernRouteId.length > 0) {
-    staticData.modernRouteId = opts.modernRouteId;
-  }
-
-  if (typeof opts.modernRouteLoader !== 'undefined') {
-    staticData.modernRouteLoader = opts.modernRouteLoader;
-  }
-
-  if (typeof opts.modernRouteAction !== 'undefined') {
-    staticData.modernRouteAction = opts.modernRouteAction;
-  }
-
-  return staticData;
-}
-
 type LoaderLikeContext = {
   abortController?: AbortController;
   signal?: AbortSignal;
@@ -142,7 +109,7 @@ function getLoaderSignal(ctx: LoaderLikeContext | undefined): AbortSignal {
   return new AbortController().signal;
 }
 
-function getLoaderHref(ctx: LoaderLikeContext | undefined): string {
+export function getLoaderHref(ctx: LoaderLikeContext | undefined): string {
   if (typeof ctx?.location === 'string') {
     return ctx.location;
   }
@@ -169,7 +136,7 @@ function getLoaderParams(
     : {};
 }
 
-function handleModernLoaderResult<LoaderResult>(
+export function handleModernLoaderResult<LoaderResult>(
   result: LoaderResult,
 ): LoaderResult {
   if (isResponse(result)) {
@@ -185,7 +152,7 @@ function handleModernLoaderResult<LoaderResult>(
   return result;
 }
 
-function handleModernLoaderError(err: unknown): never {
+export function handleModernLoaderError(err: unknown): never {
   if (isResponse(err)) {
     if (isTanstackRedirect(err)) {
       throw err;

package/src/runtime/plugin.node.tsx

@@ -75,10 +75,10 @@ export const tanstackRouterPlugin = (
       api.onBeforeRender(async (context, interrupt) => {
         const routeConfig = getTanstackRouteConfig(api, userConfig);
         const { mergedConfig } = routeConfig;
-        const serializationAdapters = getGlobalEnableRsc()
+        const enableRsc = getGlobalEnableRsc();
+        const serializationAdapters = enableRsc
           ? (await import('./rsc/server')).getTanstackRscSerializationAdapters()
           : undefined;
-        const enableRsc = getGlobalEnableRsc();
 
         const { basename = '' } = mergedConfig;
 
@@ -92,7 +92,6 @@ export const tanstackRouterPlugin = (
         const modifiedRouteObjects = createTanstackRouteObjects({
           hooks,
           routeConfig,
-          ssrMode: context.ssrContext?.mode,
         });
 
         if (!modifiedRouteObjects.length) {

package/src/runtime/plugin.tsx

@@ -222,7 +222,7 @@ export const tanstackRouterPlugin = (
             runtimeContext,
             getClientBasename(runtimeContext),
           );
-          if (router !== undefined && router !== null) {
+          if (router) {
             return getTanstackSsrHydrationPromise(router).then(() => undefined);
           }
         }
@@ -273,8 +273,7 @@ export const tanstackRouterPlugin = (
             typeof window !== 'undefined' &&
             (Boolean((window as WindowWithTanstackSsr).$_TSR) ||
               hasTanstackSsrHydrationRecord(router));
-          const needsRouterClient = hasSSRBootstrap;
-          if (needsRouterClient) {
+          if (hasSSRBootstrap) {
             hooks.onBeforeHydrateRouter.call({
               ...lifecycleContext,
               phase: 'hydrate',
@@ -283,7 +282,7 @@ export const tanstackRouterPlugin = (
             });
           }
 
-          const RouterContent = needsRouterClient ? (
+          const RouterContent = hasSSRBootstrap ? (
             <ModernRouterClient router={router} />
           ) : (
             <RouterProvider router={router} />
@@ -292,7 +291,7 @@ export const tanstackRouterPlugin = (
             RouterContent,
             hasSSRBootstrap,
           );
-          if (needsRouterClient) {
+          if (hasSSRBootstrap) {
             hooks.onAfterHydrateRouter.call({
               ...lifecycleContext,
               phase: 'hydrate',

package/src/runtime/pluginShared.ts

@@ -7,7 +7,7 @@ import { merge } from '@modern-js/runtime-utils/merge';
 import type { RouteObject } from '@modern-js/runtime-utils/router';
 import type { RouterExtendsHooks } from './hooks';
 import type { RouterConfig } from './types';
-import { createTanstackRouteObjectsFromConfig, type SSRMode } from './utils';
+import { createTanstackRouteObjectsFromConfig } from './utils';
 
 type TanstackRouterRuntimeConfig = {
   plugins?: TanstackRouterRuntimePlugin[];
@@ -80,11 +80,9 @@ export function getTanstackRouteConfig(
 export function createTanstackRouteObjects({
   hooks,
   routeConfig,
-  ssrMode,
 }: {
   hooks: RouterExtendsHooks;
   routeConfig: TanstackRouteConfig;
-  ssrMode?: SSRMode;
 }): RouteObject[] {
   const { mergedConfig, finalRouteConfig } = routeConfig;
   const routeObjects =
@@ -92,7 +90,6 @@ export function createTanstackRouteObjects({
       ? mergedConfig.createRoutes()
       : (createTanstackRouteObjectsFromConfig({
           routesConfig: finalRouteConfig,
-          ssrMode,
         }) ?? []);
 
   return hooks.modifyRoutes.call(routeObjects) as RouteObject[];

package/src/runtime/routeTree/components.ts

@@ -3,7 +3,7 @@
 import type { RouteObject } from '@modern-js/runtime-utils/router';
 import { createElement, type ElementType } from 'react';
 
-import type { ModernRouteObject, RouteTreeOptions } from './types';
+import type { ModernRouteObject } from './types';
 
 type ModernRouteModule = {
   Component?: unknown;
@@ -85,10 +85,7 @@ function createServerLazyImportComponent(
   return Component;
 }
 
-export function toRouteComponent(
-  routeObject: RouteObject,
-  options: RouteTreeOptions = {},
-): unknown {
+export function toRouteComponent(routeObject: RouteObject): unknown {
   const route = routeObject as ModernRouteObject;
   const lazyImport =
     typeof route.lazyImport === 'function' ? route.lazyImport : undefined;

package/src/runtime/routeTree/construction.ts

@@ -5,6 +5,7 @@ import type { RouteObject } from '@modern-js/runtime-utils/router';
 import type { AnyRoute, AnyRouter } from '@tanstack/react-router';
 import { rootRouteId } from '@tanstack/react-router';
 
+import { createRouteStaticData } from '../../shared/routeStaticData';
 import { withModernRouteMatchContext } from '../outlet';
 import {
   toErrorComponent,
@@ -13,7 +14,7 @@ import {
 } from './components';
 import { createModernShouldReload, wrapRouteObjectLoader } from './loaders';
 import { isRouteObjectPathlessLayout, toTanstackPath } from './paths';
-import { createRouteStaticData, mergeModernRouteHandle } from './staticData';
+import { mergeModernRouteHandle } from './staticData';
 import {
   createTanstackRootRoute,
   createTanstackRoute,
@@ -52,7 +53,7 @@ function createRouteFromRouteObject(opts: {
   const stableFallbackId =
     routeObject.id || modernRouteObject.file || pathlessFallbackId;
 
-  const component = toRouteComponent(routeObject, options);
+  const component = toRouteComponent(routeObject);
   const base: TanstackRouteOptions = {
     getParentRoute: () => parent,
     component,

package/src/runtime/routeTree/loaders.ts

@@ -1,13 +1,11 @@
 // @effect-diagnostics asyncFunction:off strictBooleanExpressions:off
 
 import type { RouteObject } from '@modern-js/runtime-utils/router';
-import { notFound } from '@tanstack/react-router';
-
 import {
-  isRedirectResponse,
-  isResponse,
-  isTanstackRedirect,
-  throwTanstackRedirect,
+  getLoaderHref,
+  handleModernLoaderError,
+  handleModernLoaderResult,
+  mapSplatParamsForModernLoader,
 } from '../loaderBridge';
 import {
   isTanstackRscPayloadNavigationEnabled,
@@ -16,7 +14,6 @@ import {
 import type {
   ModernRouteObject,
   ModernShouldRevalidate,
-  RouteParams,
   RouteRevalidationState,
   RouteTreeOptions,
   TanstackLoaderContext,
@@ -48,31 +45,11 @@ function normalizeModernLoaderResult(result: unknown): unknown {
 }
 
 function normalizeModernLoaderResponse(result: unknown): unknown {
-  if (isResponse(result)) {
-    if (isRedirectResponse(result)) {
-      const location = result.headers.get('Location') || '/';
-      throwTanstackRedirect(location);
-    }
-    if (result.status === 404) {
-      throw notFound();
-    }
-  }
-
-  return normalizeModernLoaderResult(result);
-}
-
-function createModernRequest(input: string, signal: AbortSignal) {
-  return new Request(input, { signal });
+  return normalizeModernLoaderResult(handleModernLoaderResult(result));
 }
 
 function getModernUrlFromLoaderContext(ctx: TanstackLoaderContext): URL {
-  const href =
-    typeof ctx?.location === 'string'
-      ? ctx.location
-      : ctx?.location?.publicHref ||
-        ctx?.location?.href ||
-        ctx?.location?.url?.href ||
-        '/';
+  const href = getLoaderHref(ctx) || '/';
   const baseRequest: Request | undefined =
     ctx?.context?.request instanceof Request ? ctx.context.request : undefined;
   const baseUrl =
@@ -118,29 +95,6 @@ export function createModernShouldReload(
   };
 }
 
-function isRouteObjectSplatRoute(route: RouteObject) {
-  return typeof route.path === 'string' && route.path.includes('*');
-}
-
-function mapParamsForRouteObjectLoader({
-  route,
-  params,
-}: {
-  route: RouteObject;
-  params: RouteParams;
-}) {
-  if (isRouteObjectSplatRoute(route)) {
-    const { _splat, ...rest } = params as RouteParams & {
-      _splat?: string;
-    };
-    if (typeof _splat !== 'undefined') {
-      return { ...rest, '*': _splat };
-    }
-    return rest;
-  }
-  return params;
-}
-
 export function wrapRouteObjectLoader(
   route: RouteObject,
   revalidationState?: RouteRevalidationState,
@@ -173,23 +127,17 @@ export function wrapRouteObjectLoader(
           ? ctx.context.request
           : undefined;
 
-      const href =
-        typeof ctx?.location === 'string'
-          ? ctx.location
-          : ctx?.location?.publicHref ||
-            ctx?.location?.href ||
-            ctx?.location?.url?.href ||
-            '';
+      const href = getLoaderHref(ctx);
 
       const request =
         baseRequest !== undefined
           ? new Request(baseRequest, { signal })
-          : createModernRequest(href, signal);
+          : new Request(href, { signal });
 
-      const params = mapParamsForRouteObjectLoader({
-        route,
-        params: ctx.params || {},
-      });
+      const params = mapSplatParamsForModernLoader(
+        ctx.params || {},
+        typeof route.path === 'string' && route.path.includes('*'),
+      );
 
       const loadModernData = async () => {
         const result = await routeLoader({
@@ -214,19 +162,7 @@ export function wrapRouteObjectLoader(
 
       return loadModernData();
     } catch (err) {
-      if (isResponse(err)) {
-        if (isTanstackRedirect(err)) {
-          throw err;
-        }
-        if (isRedirectResponse(err)) {
-          const location = err.headers.get('Location') || '/';
-          throwTanstackRedirect(location);
-        }
-        if (err.status === 404) {
-          throw notFound();
-        }
-      }
-      throw err;
+      handleModernLoaderError(err);
     }
   };
 }