@bleedingdev/modern-js-plugin-tanstack 3.2.0-ultramodern.12 → 3.2.0-ultramodern.120

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

@@ -1,6 +1,8 @@
 import "node:module";
-import { createRootRoute, createRoute, notFound, redirect } from "@tanstack/react-router";
+import { createRootRoute, createRoute, notFound, redirect, rootRouteId } from "@tanstack/react-router";
+import { createElement } from "react";
 import { DefaultNotFound } from "./DefaultNotFound.mjs";
+import { withModernRouteMatchContext } from "./outlet.mjs";
 import { isTanstackRscPayloadNavigationEnabled, loadTanstackRscRouteData } from "./rsc/payloadRouter.mjs";
 function createTanstackRoute(options) {
     return createRoute(options);
@@ -8,6 +10,10 @@ function createTanstackRoute(options) {
 function createTanstackRootRoute(options) {
     return createRootRoute(options);
 }
+function wrapRouteComponentWithModernContext(route, component, routeId) {
+    const routeMatchId = routeId || route.id;
+    if (component && routeMatchId) route.options.component = withModernRouteMatchContext(component, routeMatchId);
+}
 function toTanstackPath(pathname) {
     return pathname.split('/').map((segment)=>{
         if (!segment) return segment;
@@ -55,6 +61,40 @@ function normalizeModernLoaderResponse(result) {
     }
     return normalizeModernLoaderResult(result);
 }
+function pickRouteModuleComponent(routeModule, seen = new Set()) {
+    if ('function' == typeof routeModule || routeModule && 'object' == typeof routeModule && '$$typeof' in routeModule) return routeModule;
+    if (!routeModule || 'object' != typeof routeModule) return;
+    if (seen.has(routeModule)) return;
+    seen.add(routeModule);
+    const module = routeModule;
+    for (const candidate of [
+        module.default,
+        module.Component
+    ]){
+        const component = pickRouteModuleComponent(candidate, seen);
+        if (component) return component;
+    }
+}
+function createServerLazyImportComponent(lazyImport, fallbackComponent) {
+    if ("u" > typeof document) return fallbackComponent;
+    let resolvedComponent;
+    let pendingLoad;
+    const load = async ()=>{
+        if (resolvedComponent) return resolvedComponent;
+        const routeModule = await lazyImport();
+        const component = pickRouteModuleComponent(routeModule);
+        if (component) resolvedComponent = component;
+        return resolvedComponent;
+    };
+    const Component = (props)=>{
+        if (resolvedComponent) return createElement(resolvedComponent, props);
+        pendingLoad ||= load();
+        throw pendingLoad;
+    };
+    Component.load = load;
+    Component.preload = load;
+    return Component;
+}
 function isAbsoluteUrl(value) {
     try {
         new URL(value);
@@ -127,7 +167,7 @@ function wrapModernLoader(modernRoute, modernLoader, revalidationState, options
             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 request = baseRequest ? new Request(baseRequest, {
+            const request = void 0 !== baseRequest ? new Request(baseRequest, {
                 signal
             }) : createModernRequest(href, signal);
             const params = mapParamsForModernLoader({
@@ -192,7 +232,7 @@ function wrapRouteObjectLoader(route, revalidationState, options = {}) {
             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 request = baseRequest ? new Request(baseRequest, {
+            const request = void 0 !== baseRequest ? new Request(baseRequest, {
                 signal
             }) : createModernRequest(href, signal);
             const params = mapParamsForRouteObjectLoader({
@@ -229,10 +269,18 @@ function wrapRouteObjectLoader(route, revalidationState, options = {}) {
 }
 function toRouteComponent(routeObject) {
     const route = routeObject;
+    const lazyImport = 'function' == typeof route.lazyImport ? route.lazyImport : void 0;
+    const fallbackComponent = route.Component ? route.Component : route.element ? ()=>route.element : void 0;
+    if (lazyImport && fallbackComponent) return createServerLazyImportComponent(lazyImport, fallbackComponent);
     if (route.Component) return route.Component;
     const element = route.element;
     if (element) return ()=>element;
 }
+function toModernRouteComponent(route) {
+    const component = route.component || void 0;
+    if ('function' == typeof route.lazyImport && component) return createServerLazyImportComponent(route.lazyImport, component);
+    return component;
+}
 function toErrorComponent(routeObject) {
     const route = routeObject;
     if (route.ErrorBoundary) return route.ErrorBoundary;
@@ -270,12 +318,14 @@ function createRouteFromRouteObject(opts) {
     const shouldRevalidate = modernRouteObject.shouldRevalidate;
     const shouldReload = createModernShouldReload(shouldRevalidate, revalidationState);
     const stableFallbackId = routeObject.id || modernRouteObject.file || routeObject.path || 'pathless';
+    const component = toRouteComponent(routeObject);
     const base = {
         getParentRoute: ()=>parent,
-        component: toRouteComponent(routeObject),
+        component,
         pendingComponent: toPendingComponent(routeObject),
         errorComponent: toErrorComponent(routeObject),
-        wrapInSuspense: true,
+        validateSearch: modernRouteObject.validateSearch,
+        loaderDeps: modernRouteObject.loaderDeps,
         staticData: createRouteStaticData({
             modernRouteId: routeObject.id,
             modernRouteAction: modernRouteObject.action,
@@ -294,6 +344,7 @@ function createRouteFromRouteObject(opts) {
     if (isRouteObjectPathlessLayout(routeObject)) base.id = stableFallbackId;
     else base.path = routeObject.index ? '/' : toTanstackPath(routeObject.path || '');
     const route = createTanstackRoute(base);
+    wrapRouteComponentWithModernContext(route, component, routeObject.id);
     const children = routeObject.children;
     if (children && children.length > 0) {
         const childRoutes = children.map((child)=>createRouteFromRouteObject({
@@ -313,7 +364,7 @@ function createRouteFromModernRoute(opts) {
     const stableFallbackId = modernId || route._component || route.filename || route.data || ('function' == typeof route.loader ? route.id : void 0);
     const pendingComponent = route.loading || route.pendingComponent;
     const errorComponent = route.error || route.errorComponent;
-    const component = route.component;
+    const component = toModernRouteComponent(route);
     const modernLoader = route.loader;
     const modernAction = route.action;
     const modernShouldRevalidate = route.shouldRevalidate;
@@ -325,7 +376,8 @@ function createRouteFromModernRoute(opts) {
         component: component || void 0,
         pendingComponent: pendingComponent || void 0,
         errorComponent: errorComponent || void 0,
-        wrapInSuspense: true,
+        validateSearch: route.validateSearch,
+        loaderDeps: route.loaderDeps,
         staticData: createRouteStaticData({
             modernRouteId: modernId,
             modernRouteAction: modernAction,
@@ -347,6 +399,7 @@ function createRouteFromModernRoute(opts) {
         base.path = isIndexRoute ? '/' : toTanstackPath(rawPath || '');
     }
     const tanstackRoute = createTanstackRoute(base);
+    wrapRouteComponentWithModernContext(tanstackRoute, component, modernId);
     const children = route.children;
     if (children && children.length > 0) {
         const childRoutes = children.map((child)=>createRouteFromModernRoute({
@@ -360,7 +413,7 @@ function createRouteFromModernRoute(opts) {
 }
 function createRouteTreeFromModernRoutes(routes, options = {}) {
     const rootModern = routes.find((r)=>r && 'nested' === r.type && r.isRoot);
-    const rootComponent = rootModern?.component;
+    const rootComponent = rootModern ? toModernRouteComponent(rootModern) : void 0;
     const pendingComponent = rootModern?.loading;
     const errorComponent = rootModern?.error;
     const rootLoader = rootModern?.loader;
@@ -373,7 +426,8 @@ function createRouteTreeFromModernRoutes(routes, options = {}) {
         component: rootComponent || void 0,
         pendingComponent: pendingComponent || void 0,
         errorComponent: errorComponent || void 0,
-        wrapInSuspense: true,
+        validateSearch: rootModern?.validateSearch,
+        loaderDeps: rootModern?.loaderDeps,
         notFoundComponent: DefaultNotFound,
         staticData: createRouteStaticData({
             modernRouteId: rootModernId,
@@ -391,6 +445,7 @@ function createRouteTreeFromModernRoutes(routes, options = {}) {
     if (rootShouldReload) rootRouteOptions.shouldReload = rootShouldReload;
     if (rootModern?.inValidSSRRoute) rootRouteOptions.ssr = false;
     const rootRoute = createTanstackRootRoute(rootRouteOptions);
+    if (rootComponent) rootRoute.options.component = withModernRouteMatchContext(rootComponent, rootRouteId);
     const topLevel = rootModern ? rootModern.children || [] : routes;
     const childRoutes = topLevel.map((child)=>createRouteFromModernRoute({
             options,
@@ -408,11 +463,13 @@ function createRouteTreeFromRouteObjects(routes, options = {}) {
     const rootRevalidationState = {};
     const rootShouldRevalidate = rootLikeRoute?.shouldRevalidate;
     const rootShouldReload = createModernShouldReload(rootShouldRevalidate, rootRevalidationState);
+    const rootComponent = rootLikeRoute ? toRouteComponent(rootLikeRoute) : void 0;
     const rootRouteOptions = {
-        component: rootLikeRoute ? toRouteComponent(rootLikeRoute) : void 0,
+        component: rootComponent,
         pendingComponent: rootLikeRoute ? toPendingComponent(rootLikeRoute) : void 0,
         errorComponent: rootLikeRoute ? toErrorComponent(rootLikeRoute) : void 0,
-        wrapInSuspense: true,
+        validateSearch: rootLikeRoute?.validateSearch,
+        loaderDeps: rootLikeRoute?.loaderDeps,
         notFoundComponent: DefaultNotFound,
         staticData: createRouteStaticData({
             modernRouteId: rootLikeRoute?.id,
@@ -430,6 +487,7 @@ function createRouteTreeFromRouteObjects(routes, options = {}) {
     if (rootShouldReload) rootRouteOptions.shouldReload = rootShouldReload;
     if (rootLikeRoute?.inValidSSRRoute) rootRouteOptions.ssr = false;
     const rootRoute = createTanstackRootRoute(rootRouteOptions);
+    if (rootComponent) rootRoute.options.component = withModernRouteMatchContext(rootComponent, rootRouteId);
     const topLevel = rootLikeRoute ? [
         ...rootLikeRoute.children || [],
         ...routes.filter((route)=>route !== rootLikeRoute)
@@ -444,9 +502,11 @@ function createRouteTreeFromRouteObjects(routes, options = {}) {
 }
 function getModernRouteIdsFromMatches(router) {
     const matches = router.state.matches || [];
+    const routesById = router.routesById;
     const ids = matches.map((match)=>{
-        const route = match.route;
-        return route?.options?.staticData?.modernRouteId;
+        const normalizedMatch = match;
+        const routeId = 'string' == typeof normalizedMatch.routeId ? normalizedMatch.routeId : void 0;
+        return normalizedMatch.route?.options?.staticData?.modernRouteId ?? (routeId ? routesById?.[routeId]?.options?.staticData?.modernRouteId : void 0);
     }).filter((id)=>'string' == typeof id);
     return Array.from(new Set(ids));
 }

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

@@ -1 +1,8 @@
 import "node:module";
+const modernTanstackRouterFastDefaults = {
+    defaultStructuralSharing: true
+};
+const getModernTanstackRouterFastDefaults = (config = {})=>({
+        defaultStructuralSharing: config.defaultStructuralSharing ?? modernTanstackRouterFastDefaults.defaultStructuralSharing
+    });
+export { getModernTanstackRouterFastDefaults, modernTanstackRouterFastDefaults };

package/dist/types/cli/index.d.ts

@@ -1,15 +1,21 @@
 import type { AppTools, AppToolsContext, CliPlugin } from '@modern-js/app-tools';
 import type { NestedRouteForCli, PageRoute } from '@modern-js/types';
-export { generateTanstackRouterTypesSourceForEntry, isTanstackRouterFrameworkEnabled, } from './tanstackTypes';
+import { type TanstackRouteCodeSplittingOption } from './routeSplitting';
+export type { TanstackRouteCodeSplittingOption, TanstackRsbuildRouteSplittingProfile, } from './routeSplitting';
+export { createTanstackRsbuildRouteSplittingProfile, isTanstackStartRouteModuleSource, resolveTanstackRouteCodeSplittingEnabled, } from './routeSplitting';
+export { collectCanonicalRoutesForEntry, generateTanstackRouterTypesSourceForEntry, isTanstackRouterFrameworkEnabled, } from './tanstackTypes';
 export type TanstackRouterPluginOptions = {
     routesDir?: string;
     generatedDirName?: string;
+    routeCodeSplitting?: TanstackRouteCodeSplittingOption;
 };
 export declare function writeTanstackRegisterFile(opts: {
     entries: string[];
     generatedDirName?: string;
     runtimeModule?: string;
     srcDirectory: string;
+    canonicalRoutes?: Record<string, string> | null;
+    i18nRuntimeModule?: string;
 }): Promise<void>;
 export declare function writeTanstackRouterTypesForEntries(opts: {
     appContext: AppToolsContext;

package/dist/types/cli/routeSplitting.d.ts

@@ -0,0 +1,29 @@
+export type TanstackRouteCodeSplittingOption = boolean | {
+    enabled?: boolean;
+};
+export type TanstackRsbuildRouteSplittingProfile = {
+    defaultConfig: {
+        output: {
+            splitRouteChunks: boolean;
+        };
+    };
+    modernRouteChunks: {
+        enabled: boolean;
+        owner: 'modern';
+    };
+    builderChunkSplit: {
+        owner: 'modern-rsbuild';
+        preserved: true;
+    };
+    tanstackStartRspackSplitter: {
+        compatible: boolean;
+        reason: string;
+        clientDeleteNodes: string[];
+        routeFactoryCalls: string[];
+    };
+};
+export declare function isTanstackStartRouteModuleSource(source: string): boolean;
+export declare function resolveTanstackRouteCodeSplittingEnabled(option?: TanstackRouteCodeSplittingOption): boolean;
+export declare function createTanstackRsbuildRouteSplittingProfile(opts: {
+    routeCodeSplitting?: TanstackRouteCodeSplittingOption;
+}): TanstackRsbuildRouteSplittingProfile;

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

@@ -1,5 +1,14 @@
 import type { AppToolsContext } from '@modern-js/app-tools';
 import type { NestedRouteForCli, PageRoute } from '@modern-js/types';
+/**
+ * Derive the canonical (language-agnostic) route map for an entry: the
+ * leading locale param is stripped and localized physical variants (routes
+ * carrying `modernCanonicalPath` metadata from `@modern-js/plugin-i18n`)
+ * collapse to their canonical pattern. Returns `null` when the entry has no
+ * i18n routing surface (no locale param and no localized variants), so plain
+ * TanStack apps never get a `@modern-js/plugin-i18n` module augmentation.
+ */
+export declare function collectCanonicalRoutesForEntry(routes: (NestedRouteForCli | PageRoute)[]): Record<string, string> | null;
 export declare function isTanstackRouterFrameworkEnabled(appContext: AppToolsContext): Promise<boolean>;
 export declare function generateTanstackRouterTypesSourceForEntry(opts: {
     appContext: AppToolsContext;

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

@@ -1,27 +1,12 @@
-declare const modifyRoutes: {
-    tap: (cb: any) => void;
-    call: (...params: any[]) => any;
-};
-declare const onBeforeCreateRoutes: {
-    tap: (cb: any) => void;
-    call: (...params: any[]) => any;
-};
-declare const onBeforeCreateRouter: {
-    tap: (cb: any) => void;
-    call: (...params: any[]) => any;
-};
-declare const onAfterCreateRouter: {
-    tap: (cb: any) => void;
-    call: (...params: any[]) => any;
-};
-declare const onBeforeHydrateRouter: {
-    tap: (cb: any) => void;
-    call: (...params: any[]) => any;
-};
-declare const onAfterHydrateRouter: {
-    tap: (cb: any) => void;
-    call: (...params: any[]) => any;
-};
+import type { TRuntimeContext } from '@modern-js/runtime/context';
+import type { RouteObject } from '@modern-js/runtime-utils/router';
+import type { RouterLifecycleContext } from './lifecycle';
+declare const modifyRoutes: import("@modern-js/plugin").SyncHook<(routes: RouteObject[]) => RouteObject[]>;
+declare const onBeforeCreateRoutes: import("@modern-js/plugin").SyncHook<(context: TRuntimeContext) => void>;
+declare const onBeforeCreateRouter: import("@modern-js/plugin").SyncHook<(context: RouterLifecycleContext) => void>;
+declare const onAfterCreateRouter: import("@modern-js/plugin").SyncHook<(context: RouterLifecycleContext) => void>;
+declare const onBeforeHydrateRouter: import("@modern-js/plugin").SyncHook<(context: RouterLifecycleContext) => void>;
+declare const onAfterHydrateRouter: import("@modern-js/plugin").SyncHook<(context: RouterLifecycleContext) => void>;
 export { modifyRoutes, onAfterCreateRouter, onAfterHydrateRouter, onBeforeCreateRouter, onBeforeCreateRoutes, onBeforeHydrateRouter, };
 export type RouterExtendsHooks = {
     modifyRoutes: typeof modifyRoutes;

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

@@ -0,0 +1,2 @@
+import { type ReactElement } from 'react';
+export declare function wrapTanstackSsrHydrationBoundary(routerContent: ReactElement, shouldWrap: boolean): import("react").JSX.Element;

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

@@ -1,9 +1,12 @@
-export * from '@tanstack/react-router';
-export { useMatch } from '@tanstack/react-router';
+export type * from '@tanstack/react-router';
+export { Asset, Await, Block, CatchBoundary, CatchNotFound, ClientOnly, cleanPath, composeRewrites, createBrowserHistory, createControlledPromise, createFileRoute, createHashHistory, createHistory, createLazyFileRoute, createLazyRoute, createLink, createMemoryHistory, createRootRoute, createRootRouteWithContext, createRoute, createRouteMask, createRouter, createRouterConfig, createSerializationAdapter, DEFAULT_PROTOCOL_ALLOWLIST, DefaultGlobalNotFound, deepEqual, defaultParseSearch, defaultStringifySearch, defer, ErrorComponent, FileRoute, FileRouteLoader, functionalUpdate, getRouteApi, HeadContent, interpolatePath, isMatch, isNotFound, isPlainArray, isPlainObject, isRedirect, joinPaths, LazyRoute, lazyFn, lazyRouteComponent, linkOptions, Match, Matches, MatchRoute, Navigate, NotFoundRoute, notFound, parseSearchWith, RootRoute, Route, RouteApi, Router, RouterContextProvider, RouterProvider, reactUse, redirect, replaceEqualDeep, resolvePath, retainSearchParams, rootRouteId, rootRouteWithContext, ScriptOnce, Scripts, ScrollRestoration, SearchParamError, stringifySearchWith, stripSearchParams, trimPath, trimPathLeft, trimPathRight, useAwaited, useBlocker, useCanGoBack, useChildMatches, useElementScrollRestoration, useHydrated, useLayoutEffect, useLinkProps, useLoaderData, useLoaderDeps, useLocation, useMatch, useMatches, useMatchRoute, useNavigate, useParams, useParentMatches, useRouteContext, useRouter, useRouterState, useSearch, useTags, } from '@tanstack/react-router';
 export type { Fetcher, FetcherState, FetcherSubmitOptions, FormProps, SubmitOptions, } from './dataMutation';
 export { Form, RouteActionResponseError, useFetcher, } from './dataMutation';
+export { Outlet } from './outlet';
 export { tanstackRouterPlugin, tanstackRouterPlugin as default, } from './plugin';
 export type { LinkProps, NavLinkProps, PrefetchBehavior, } from './prefetchLink';
 export { Link, NavLink } from './prefetchLink';
 export type { AnyCompositeComponent, AnyRenderableServerComponent, CompositeComponentProps, } from './rsc/client';
 export { CompositeComponent } from './rsc/client';
+export type { RouterConfig } from './types';
+export { getModernTanstackRouterFastDefaults, modernTanstackRouterFastDefaults, } from './types';

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

@@ -0,0 +1,2 @@
+export declare const Outlet: import("react").MemoExoticComponent<() => import("react").JSX.Element>;
+export declare function withModernRouteMatchContext(component: unknown, _routeId: string): unknown;

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

@@ -2,7 +2,7 @@ import type { Plugin, RuntimePluginExtends } from '@modern-js/plugin';
 import type { RuntimePluginAPI } from '@modern-js/plugin/runtime';
 import { type TInternalRuntimeContext } from '@modern-js/runtime/context';
 import { type RouterExtendsHooks } from './hooks';
-import type { RouterConfig } from './types';
+import { type RouterConfig } from './types';
 type TanstackRouterRuntimeConfig = {
     plugins?: TanstackRouterRuntimePlugin[];
     router?: Partial<RouterConfig>;

package/dist/types/runtime/plugin.node.d.ts

@@ -2,7 +2,7 @@ import type { Plugin, RuntimePluginExtends } from '@modern-js/plugin';
 import type { RuntimePluginAPI } from '@modern-js/plugin/runtime';
 import { type TInternalRuntimeContext } from '@modern-js/runtime/context';
 import { type RouterExtendsHooks } from './hooks';
-import type { RouterConfig } from './types';
+import { type RouterConfig } from './types';
 type TanstackRouterRuntimeConfig = {
     plugins?: TanstackRouterRuntimePlugin[];
     router?: Partial<RouterConfig>;

package/dist/types/runtime/plugin.worker.d.ts

@@ -0,0 +1 @@
+export { default, tanstackRouterPlugin, } from './plugin.node';

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

@@ -18,8 +18,15 @@ export type RouterConfig = {
     future?: Partial<{
         v7_startTransition: boolean;
     }>;
+    defaultStructuralSharing?: boolean;
     unstable_reloadOnURLMismatch?: boolean;
 };
+export declare const modernTanstackRouterFastDefaults: {
+    readonly defaultStructuralSharing: true;
+};
+export declare const getModernTanstackRouterFastDefaults: (config?: Partial<Pick<RouterConfig, 'defaultStructuralSharing'>>) => {
+    defaultStructuralSharing: boolean;
+};
 export interface RouterRouteMatchSnapshot {
     routeId: string;
     assetRouteId?: string;

package/package.json

@@ -18,7 +18,7 @@
     "modern.js",
     "tanstack-router"
   ],
-  "version": "3.2.0-ultramodern.12",
+  "version": "3.2.0-ultramodern.120",
   "engines": {
     "node": ">=20"
   },
@@ -85,33 +85,33 @@
     }
   },
   "dependencies": {
-    "@swc/helpers": "^0.5.21",
-    "@tanstack/react-router": "1.170.1",
-    "@tanstack/router-core": "1.170.1",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.2.0-ultramodern.12",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.12",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.2.0-ultramodern.12",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.12"
+    "@swc/helpers": "^0.5.23",
+    "@tanstack/react-router": "1.170.15",
+    "@tanstack/router-core": "1.171.13",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.2.0-ultramodern.120",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.2.0-ultramodern.120",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.120",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.120"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "3.2.0-ultramodern.12",
-    "react": "^19.2.6",
-    "react-dom": "^19.2.6"
+    "@modern-js/runtime": "3.2.0-ultramodern.120",
+    "react": "^19.2.7",
+    "react-dom": "^19.2.7"
   },
   "devDependencies": {
-    "@rslib/core": "0.21.5",
+    "@rslib/core": "0.22.0",
     "@tanstack/history": "1.162.0",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
-    "@types/node": "^25.8.0",
-    "@types/react": "^19.2.14",
+    "@types/node": "^25.9.3",
+    "@types/react": "^19.2.17",
     "@types/react-dom": "^19.2.3",
-    "@typescript/native-preview": "7.0.0-dev.20260516.1",
-    "react": "^19.2.6",
-    "react-dom": "^19.2.6",
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.2.0-ultramodern.12",
-    "@scripts/rstest-config": "2.66.0",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.2.0-ultramodern.12"
+    "@typescript/native-preview": "7.0.0-dev.20260610.1",
+    "react": "^19.2.7",
+    "react-dom": "^19.2.7",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.2.0-ultramodern.120",
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.2.0-ultramodern.120",
+    "@scripts/rstest-config": "2.66.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/src/cli/index.ts

@@ -19,11 +19,26 @@ import {
   NESTED_ROUTE_SPEC_FILE,
 } from '@modern-js/utils';
 import {
+  createTanstackRsbuildRouteSplittingProfile,
+  type TanstackRouteCodeSplittingOption,
+} from './routeSplitting';
+import {
+  collectCanonicalRoutesForEntry,
   generateTanstackRouterTypesSourceForEntry,
   isTanstackRouterFrameworkEnabled,
 } from './tanstackTypes';
 
+export type {
+  TanstackRouteCodeSplittingOption,
+  TanstackRsbuildRouteSplittingProfile,
+} from './routeSplitting';
+export {
+  createTanstackRsbuildRouteSplittingProfile,
+  isTanstackStartRouteModuleSource,
+  resolveTanstackRouteCodeSplittingEnabled,
+} from './routeSplitting';
 export {
+  collectCanonicalRoutesForEntry,
   generateTanstackRouterTypesSourceForEntry,
   isTanstackRouterFrameworkEnabled,
 } from './tanstackTypes';
@@ -35,6 +50,7 @@ const ENTRYPOINTS_KEY = '@modern-js/plugin-tanstack';
 export type TanstackRouterPluginOptions = {
   routesDir?: string;
   generatedDirName?: string;
+  routeCodeSplitting?: TanstackRouteCodeSplittingOption;
 };
 
 type RuntimeRouterCliHelpers = {
@@ -110,6 +126,8 @@ async function writeFileIfChanged(filePath: string, content: string) {
 function createRegisterDtsContent(opts: {
   entries: string[];
   runtimeModule: string;
+  canonicalRoutes?: Record<string, string> | null;
+  i18nRuntimeModule?: string;
 }) {
   const importStatements = opts.entries
     .map(
@@ -121,6 +139,20 @@ function createRegisterDtsContent(opts: {
     .map((_, index) => `typeof router${index}`)
     .join(' | ');
 
+  const canonicalEntries = Object.entries(opts.canonicalRoutes ?? {});
+  const canonicalRoutesAugmentation =
+    canonicalEntries.length > 0
+      ? `
+declare module '${opts.i18nRuntimeModule || '@modern-js/plugin-i18n/runtime'}' {
+  interface UltramodernCanonicalRoutes {
+${canonicalEntries
+  .map(([routePath, paramsType]) => `    '${routePath}': ${paramsType};`)
+  .join('\n')}
+  }
+}
+`
+      : '';
+
   return `// This file is auto-generated by Modern.js. Do not edit manually.
 
 ${importStatements}
@@ -130,7 +162,7 @@ declare module '${opts.runtimeModule}' {
     router: ${routerUnionType};
   }
 }
-`;
+${canonicalRoutesAugmentation}`;
 }
 
 export async function writeTanstackRegisterFile(opts: {
@@ -138,12 +170,16 @@ export async function writeTanstackRegisterFile(opts: {
   generatedDirName?: string;
   runtimeModule?: string;
   srcDirectory: string;
+  canonicalRoutes?: Record<string, string> | null;
+  i18nRuntimeModule?: string;
 }) {
   const {
     entries,
     generatedDirName = DEFAULT_GENERATED_DIR_NAME,
     runtimeModule = '@modern-js/plugin-tanstack/runtime',
     srcDirectory,
+    canonicalRoutes,
+    i18nRuntimeModule,
   } = opts;
 
   if (entries.length === 0) {
@@ -158,7 +194,12 @@ export async function writeTanstackRegisterFile(opts: {
 
   await writeFileIfChanged(
     registerDtsPath,
-    createRegisterDtsContent({ entries, runtimeModule }),
+    createRegisterDtsContent({
+      entries,
+      runtimeModule,
+      canonicalRoutes,
+      i18nRuntimeModule,
+    }),
   );
 }
 
@@ -211,10 +252,23 @@ export async function writeTanstackRouterTypesForEntries(opts: {
     return a.localeCompare(b);
   });
 
+  // Merge the canonical (language-agnostic) route maps of every entry so the
+  // typed i18n Link covers all routes the app can navigate to.
+  let canonicalRoutes: Record<string, string> | null = null;
+  for (const entryName of registerEntries) {
+    const entryCanonicalRoutes = collectCanonicalRoutesForEntry(
+      routesByEntry[entryName],
+    );
+    if (entryCanonicalRoutes) {
+      canonicalRoutes = { ...entryCanonicalRoutes, ...(canonicalRoutes ?? {}) };
+    }
+  }
+
   await writeTanstackRegisterFile({
     entries: registerEntries,
     generatedDirName,
     srcDirectory: appContext.srcDirectory,
+    canonicalRoutes,
   });
 }
 
@@ -224,6 +278,8 @@ export function tanstackRouterPlugin(
   const routesDir = options.routesDir || DEFAULT_ROUTES_DIR;
   const generatedDirName =
     options.generatedDirName || DEFAULT_GENERATED_DIR_NAME;
+  const routeSplittingProfile =
+    createTanstackRsbuildRouteSplittingProfile(options);
 
   return {
     name: '@modern-js/plugin-tanstack',
@@ -265,6 +321,7 @@ export function tanstackRouterPlugin(
       }));
 
       api.config(() => ({
+        ...routeSplittingProfile.defaultConfig,
         source: {
           include: [
             /[\\/]node_modules[\\/]@tanstack[\\/]react-router[\\/]/,