@bleedingdev/modern-js-plugin-tanstack 3.9.0-ultramodern.2 → 3.9.0-ultramodern.4

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

@@ -30,11 +30,13 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     generateTanstackRouterTypesSourceForEntry: ()=>generateTanstackRouterTypesSourceForEntry
 });
+const i18n_runtime_extensions_namespaceObject = require("@modern-js/i18n-runtime-extensions");
 const cli_namespaceObject = require("@modern-js/runtime/cli");
 const utils_namespaceObject = require("@modern-js/utils");
 const external_shared_js_namespaceObject = require("./shared.js");
 async function generateTanstackRouterTypesSourceForEntry(opts) {
-    const { appContext, entryName, generatedDirName = 'modern-tanstack', routes } = opts;
+    const { appContext, entryName, generatedDirName = 'modern-tanstack', routes: rawRoutes } = opts;
+    const routes = (0, i18n_runtime_extensions_namespaceObject.canonicaliseLocalisedRoutes)(rawRoutes);
     const outDir = utils_namespaceObject.upath.join(appContext.srcDirectory, generatedDirName, entryName);
     const rootModern = routes.find((r)=>{
         const extras = r;

package/dist/cjs/runtime/basepathRewrite.js

@@ -27,19 +27,25 @@ var __webpack_require__ = {};
 })();
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    createModernBasepathRewrite: ()=>createModernBasepathRewrite
+});
+const i18n_runtime_extensions_namespaceObject = require("@modern-js/i18n-runtime-extensions");
+const react_router_namespaceObject = require("@tanstack/react-router");
 function normalizeBasepath(basepath) {
     if (!basepath) return '/';
     let normalized = basepath.startsWith('/') ? basepath : `/${basepath}`;
     if (normalized.length > 1 && normalized.endsWith('/')) normalized = normalized.slice(0, -1);
     return normalized || '/';
 }
-function createModernBasepathRewrite(basepath, caseSensitive = false) {
+function createModernBasepathRewrite(basepath, caseSensitive = false, routes = []) {
+    const localisedRewrite = (0, i18n_runtime_extensions_namespaceObject.createLocalisedRouteRewrite)(routes);
     const normalizedBasepath = normalizeBasepath(basepath);
-    if ('/' === normalizedBasepath) return;
+    if ('/' === normalizedBasepath) return localisedRewrite;
     const normalizedBasepathWithSlash = `${normalizedBasepath}/`;
     const checkBasepath = caseSensitive ? normalizedBasepath : normalizedBasepath.toLowerCase();
     const checkBasepathWithSlash = caseSensitive ? normalizedBasepathWithSlash : normalizedBasepathWithSlash.toLowerCase();
-    return {
+    const basepathRewrite = {
         input: ({ url })=>{
             const pathname = caseSensitive ? url.pathname : url.pathname.toLowerCase();
             if (pathname === checkBasepath) url.pathname = '/';
@@ -53,10 +59,11 @@ function createModernBasepathRewrite(basepath, caseSensitive = false) {
             return url;
         }
     };
+    return localisedRewrite ? (0, react_router_namespaceObject.composeRewrites)([
+        basepathRewrite,
+        localisedRewrite
+    ]) : basepathRewrite;
 }
-__webpack_require__.d(__webpack_exports__, {
-    createModernBasepathRewrite: ()=>createModernBasepathRewrite
-});
 exports.createModernBasepathRewrite = __webpack_exports__.createModernBasepathRewrite;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "createModernBasepathRewrite"

package/dist/cjs/runtime/plugin.js

@@ -110,7 +110,7 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                 const mergedConfig = getMergedConfig();
                 const { supportHtml5History = true } = mergedConfig;
                 const history = supportHtml5History ? (0, react_router_namespaceObject.createBrowserHistory)() : (0, react_router_namespaceObject.createHashHistory)();
-                const rewrite = (0, external_basepathRewrite_js_namespaceObject.createModernBasepathRewrite)(_basename);
+                const rewrite = (0, external_basepathRewrite_js_namespaceObject.createModernBasepathRewrite)(_basename, false, getRouteObjects());
                 const serializationAdapters = (0, context_namespaceObject.getGlobalEnableRsc)() ? (0, client_js_namespaceObject.getTanstackRscSerializationAdapters)() : void 0;
                 const routerFastDefaults = (0, external_types_js_namespaceObject.getModernTanstackRouterFastDefaults)(mergedConfig);
                 cachedRouter = (0, react_router_namespaceObject.createRouter)({

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

@@ -43,6 +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_prefetchLink_js_namespaceObject = require("./prefetchLink.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");
@@ -68,6 +69,9 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                     routeConfig
                 });
                 if (!modifiedRouteObjects.length) return;
+                context.router = {
+                    Link: external_prefetchLink_js_namespaceObject.Link
+                };
                 const { request, nonce, baseUrl, loaderFailureMode = 'errorBoundary' } = context.ssrContext;
                 const _basename = '/' === baseUrl ? (0, external_pluginShared_js_namespaceObject.joinBasename)(baseUrl, basename || '') : baseUrl;
                 const rawRequest = request.raw;
@@ -90,7 +94,7 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                         initialHref
                     ]
                 });
-                const rewrite = (0, external_basepathRewrite_js_namespaceObject.createModernBasepathRewrite)(_basename);
+                const rewrite = (0, external_basepathRewrite_js_namespaceObject.createModernBasepathRewrite)(_basename, false, modifiedRouteObjects);
                 const routerLifecycleContext = {
                     framework: 'tanstack',
                     phase: 'ssr-prepare',

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

@@ -31,6 +31,7 @@ __webpack_require__.d(__webpack_exports__, {
     createRouteTreeFromRouteObjects: ()=>createRouteTreeFromRouteObjects,
     getModernRouteIdsFromMatches: ()=>getModernRouteIdsFromMatches
 });
+const i18n_runtime_extensions_namespaceObject = require("@modern-js/i18n-runtime-extensions");
 const context_namespaceObject = require("@modern-js/runtime/context");
 const react_router_namespaceObject = require("@tanstack/react-router");
 const routeStaticData_js_namespaceObject = require("../../shared/routeStaticData.js");
@@ -90,6 +91,7 @@ function getRootLikeRouteObject(routes) {
     return routes.find((route)=>'/' === route.path && !route.index);
 }
 function createRouteTreeFromRouteObjects(routes, options = {}) {
+    routes = (0, i18n_runtime_extensions_namespaceObject.canonicaliseLocalisedRoutes)(routes);
     const rootLikeRoute = getRootLikeRouteObject(routes);
     const rootRevalidationState = {};
     const rootShouldRevalidate = rootLikeRoute?.shouldRevalidate;

package/dist/cjs/runtime/utils.js

@@ -55,6 +55,7 @@ function withGlobalLayout(Component, globalApp) {
 }
 function toTanstackRouteObject(route, globalApp) {
     if ('nested' === route.type) return {
+        modernLocalisedRoute: Reflect.get(route, 'modernLocalisedRoute'),
         path: route.path,
         id: route.id,
         loader: route.loader,
@@ -79,6 +80,7 @@ function toTanstackRouteObject(route, globalApp) {
     if ('function' != typeof route.component && 'object' != typeof route.component) return null;
     const LayoutComponent = withGlobalLayout(route.component, globalApp);
     return {
+        modernLocalisedRoute: Reflect.get(route, 'modernLocalisedRoute'),
         path: route.path,
         element: /*#__PURE__*/ (external_react_default()).createElement(LayoutComponent)
     };

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

@@ -1,8 +1,10 @@
+import { canonicaliseLocalisedRoutes } from "@modern-js/i18n-runtime-extensions";
 import { makeLegalIdentifier } from "@modern-js/runtime/cli";
 import { upath } from "@modern-js/utils";
 import { createRouteStaticDataSnippet, isIndexRoute, isPathlessLayout, normalizeRelativeImport, pickModernLoaderModule, pickRouteSearchContractModules, quote, resolveFileNoExt, toTanstackPath } from "./shared.mjs";
 async function generateTanstackRouterTypesSourceForEntry(opts) {
-    const { appContext, entryName, generatedDirName = 'modern-tanstack', routes } = opts;
+    const { appContext, entryName, generatedDirName = 'modern-tanstack', routes: rawRoutes } = opts;
+    const routes = canonicaliseLocalisedRoutes(rawRoutes);
     const outDir = upath.join(appContext.srcDirectory, generatedDirName, entryName);
     const rootModern = routes.find((r)=>{
         const extras = r;

package/dist/esm/runtime/basepathRewrite.mjs

@@ -1,16 +1,19 @@
+import { createLocalisedRouteRewrite } from "@modern-js/i18n-runtime-extensions";
+import { composeRewrites } from "@tanstack/react-router";
 function normalizeBasepath(basepath) {
     if (!basepath) return '/';
     let normalized = basepath.startsWith('/') ? basepath : `/${basepath}`;
     if (normalized.length > 1 && normalized.endsWith('/')) normalized = normalized.slice(0, -1);
     return normalized || '/';
 }
-function createModernBasepathRewrite(basepath, caseSensitive = false) {
+function createModernBasepathRewrite(basepath, caseSensitive = false, routes = []) {
+    const localisedRewrite = createLocalisedRouteRewrite(routes);
     const normalizedBasepath = normalizeBasepath(basepath);
-    if ('/' === normalizedBasepath) return;
+    if ('/' === normalizedBasepath) return localisedRewrite;
     const normalizedBasepathWithSlash = `${normalizedBasepath}/`;
     const checkBasepath = caseSensitive ? normalizedBasepath : normalizedBasepath.toLowerCase();
     const checkBasepathWithSlash = caseSensitive ? normalizedBasepathWithSlash : normalizedBasepathWithSlash.toLowerCase();
-    return {
+    const basepathRewrite = {
         input: ({ url })=>{
             const pathname = caseSensitive ? url.pathname : url.pathname.toLowerCase();
             if (pathname === checkBasepath) url.pathname = '/';
@@ -24,5 +27,9 @@ function createModernBasepathRewrite(basepath, caseSensitive = false) {
             return url;
         }
     };
+    return localisedRewrite ? composeRewrites([
+        basepathRewrite,
+        localisedRewrite
+    ]) : basepathRewrite;
 }
 export { createModernBasepathRewrite };

package/dist/esm/runtime/plugin.mjs

@@ -77,7 +77,7 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                 const mergedConfig = getMergedConfig();
                 const { supportHtml5History = true } = mergedConfig;
                 const history = supportHtml5History ? createBrowserHistory() : createHashHistory();
-                const rewrite = createModernBasepathRewrite(_basename);
+                const rewrite = createModernBasepathRewrite(_basename, false, getRouteObjects());
                 const serializationAdapters = getGlobalEnableRsc() ? getTanstackRscSerializationAdapters() : void 0;
                 const routerFastDefaults = getModernTanstackRouterFastDefaults(mergedConfig);
                 cachedRouter = createRouter({

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

@@ -10,6 +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 { Link } from "./prefetchLink.mjs";
 import { createRouteTreeFromRouteObjects, getModernRouteIdsFromMatches } from "./routeTree/index.mjs";
 import { createTanstackRscServerPayload, handleTanstackRscRedirect } from "./rsc/payloadRouter.mjs";
 import { getTanstackRscRouter, setTanstackRscRouter, setTanstackRscServerPayload } from "./rsc/payloadStorage.mjs";
@@ -35,6 +36,9 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                     routeConfig
                 });
                 if (!modifiedRouteObjects.length) return;
+                context.router = {
+                    Link: Link
+                };
                 const { request, nonce, baseUrl, loaderFailureMode = 'errorBoundary' } = context.ssrContext;
                 const _basename = '/' === baseUrl ? joinBasename(baseUrl, basename || '') : baseUrl;
                 const rawRequest = request.raw;
@@ -57,7 +61,7 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                         initialHref
                     ]
                 });
-                const rewrite = createModernBasepathRewrite(_basename);
+                const rewrite = createModernBasepathRewrite(_basename, false, modifiedRouteObjects);
                 const routerLifecycleContext = {
                     framework: 'tanstack',
                     phase: 'ssr-prepare',

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

@@ -1,3 +1,4 @@
+import { canonicaliseLocalisedRoutes } from "@modern-js/i18n-runtime-extensions";
 import { DefaultNotFound } from "@modern-js/runtime/context";
 import { rootRouteId } from "@tanstack/react-router";
 import { createRouteStaticData } from "../../shared/routeStaticData.mjs";
@@ -57,6 +58,7 @@ function getRootLikeRouteObject(routes) {
     return routes.find((route)=>'/' === route.path && !route.index);
 }
 function createRouteTreeFromRouteObjects(routes, options = {}) {
+    routes = canonicaliseLocalisedRoutes(routes);
     const rootLikeRoute = getRootLikeRouteObject(routes);
     const rootRevalidationState = {};
     const rootShouldRevalidate = rootLikeRoute?.shouldRevalidate;

package/dist/esm/runtime/utils.mjs

@@ -13,6 +13,7 @@ function withGlobalLayout(Component, globalApp) {
 }
 function toTanstackRouteObject(route, globalApp) {
     if ('nested' === route.type) return {
+        modernLocalisedRoute: Reflect.get(route, 'modernLocalisedRoute'),
         path: route.path,
         id: route.id,
         loader: route.loader,
@@ -37,6 +38,7 @@ function toTanstackRouteObject(route, globalApp) {
     if ('function' != typeof route.component && 'object' != typeof route.component) return null;
     const LayoutComponent = withGlobalLayout(route.component, globalApp);
     return {
+        modernLocalisedRoute: Reflect.get(route, 'modernLocalisedRoute'),
         path: route.path,
         element: /*#__PURE__*/ react.createElement(LayoutComponent)
     };

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

@@ -1,9 +1,11 @@
 import "node:module";
+import { canonicaliseLocalisedRoutes } from "@modern-js/i18n-runtime-extensions";
 import { makeLegalIdentifier } from "@modern-js/runtime/cli";
 import { upath } from "@modern-js/utils";
 import { createRouteStaticDataSnippet, isIndexRoute, isPathlessLayout, normalizeRelativeImport, pickModernLoaderModule, pickRouteSearchContractModules, quote, resolveFileNoExt, toTanstackPath } from "./shared.mjs";
 async function generateTanstackRouterTypesSourceForEntry(opts) {
-    const { appContext, entryName, generatedDirName = 'modern-tanstack', routes } = opts;
+    const { appContext, entryName, generatedDirName = 'modern-tanstack', routes: rawRoutes } = opts;
+    const routes = canonicaliseLocalisedRoutes(rawRoutes);
     const outDir = upath.join(appContext.srcDirectory, generatedDirName, entryName);
     const rootModern = routes.find((r)=>{
         const extras = r;

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

@@ -1,17 +1,20 @@
 import "node:module";
+import { createLocalisedRouteRewrite } from "@modern-js/i18n-runtime-extensions";
+import { composeRewrites } from "@tanstack/react-router";
 function normalizeBasepath(basepath) {
     if (!basepath) return '/';
     let normalized = basepath.startsWith('/') ? basepath : `/${basepath}`;
     if (normalized.length > 1 && normalized.endsWith('/')) normalized = normalized.slice(0, -1);
     return normalized || '/';
 }
-function createModernBasepathRewrite(basepath, caseSensitive = false) {
+function createModernBasepathRewrite(basepath, caseSensitive = false, routes = []) {
+    const localisedRewrite = createLocalisedRouteRewrite(routes);
     const normalizedBasepath = normalizeBasepath(basepath);
-    if ('/' === normalizedBasepath) return;
+    if ('/' === normalizedBasepath) return localisedRewrite;
     const normalizedBasepathWithSlash = `${normalizedBasepath}/`;
     const checkBasepath = caseSensitive ? normalizedBasepath : normalizedBasepath.toLowerCase();
     const checkBasepathWithSlash = caseSensitive ? normalizedBasepathWithSlash : normalizedBasepathWithSlash.toLowerCase();
-    return {
+    const basepathRewrite = {
         input: ({ url })=>{
             const pathname = caseSensitive ? url.pathname : url.pathname.toLowerCase();
             if (pathname === checkBasepath) url.pathname = '/';
@@ -25,5 +28,9 @@ function createModernBasepathRewrite(basepath, caseSensitive = false) {
             return url;
         }
     };
+    return localisedRewrite ? composeRewrites([
+        basepathRewrite,
+        localisedRewrite
+    ]) : basepathRewrite;
 }
 export { createModernBasepathRewrite };

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

@@ -78,7 +78,7 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                 const mergedConfig = getMergedConfig();
                 const { supportHtml5History = true } = mergedConfig;
                 const history = supportHtml5History ? createBrowserHistory() : createHashHistory();
-                const rewrite = createModernBasepathRewrite(_basename);
+                const rewrite = createModernBasepathRewrite(_basename, false, getRouteObjects());
                 const serializationAdapters = getGlobalEnableRsc() ? getTanstackRscSerializationAdapters() : void 0;
                 const routerFastDefaults = getModernTanstackRouterFastDefaults(mergedConfig);
                 cachedRouter = createRouter({

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

@@ -11,6 +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 { Link } from "./prefetchLink.mjs";
 import { createRouteTreeFromRouteObjects, getModernRouteIdsFromMatches } from "./routeTree/index.mjs";
 import { createTanstackRscServerPayload, handleTanstackRscRedirect } from "./rsc/payloadRouter.mjs";
 import { getTanstackRscRouter, setTanstackRscRouter, setTanstackRscServerPayload } from "./rsc/payloadStorage.mjs";
@@ -36,6 +37,9 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                     routeConfig
                 });
                 if (!modifiedRouteObjects.length) return;
+                context.router = {
+                    Link: Link
+                };
                 const { request, nonce, baseUrl, loaderFailureMode = 'errorBoundary' } = context.ssrContext;
                 const _basename = '/' === baseUrl ? joinBasename(baseUrl, basename || '') : baseUrl;
                 const rawRequest = request.raw;
@@ -58,7 +62,7 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                         initialHref
                     ]
                 });
-                const rewrite = createModernBasepathRewrite(_basename);
+                const rewrite = createModernBasepathRewrite(_basename, false, modifiedRouteObjects);
                 const routerLifecycleContext = {
                     framework: 'tanstack',
                     phase: 'ssr-prepare',

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

@@ -1,4 +1,5 @@
 import "node:module";
+import { canonicaliseLocalisedRoutes } from "@modern-js/i18n-runtime-extensions";
 import { DefaultNotFound } from "@modern-js/runtime/context";
 import { rootRouteId } from "@tanstack/react-router";
 import { createRouteStaticData } from "../../shared/routeStaticData.mjs";
@@ -58,6 +59,7 @@ function getRootLikeRouteObject(routes) {
     return routes.find((route)=>'/' === route.path && !route.index);
 }
 function createRouteTreeFromRouteObjects(routes, options = {}) {
+    routes = canonicaliseLocalisedRoutes(routes);
     const rootLikeRoute = getRootLikeRouteObject(routes);
     const rootRevalidationState = {};
     const rootShouldRevalidate = rootLikeRoute?.shouldRevalidate;

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

@@ -14,6 +14,7 @@ function withGlobalLayout(Component, globalApp) {
 }
 function toTanstackRouteObject(route, globalApp) {
     if ('nested' === route.type) return {
+        modernLocalisedRoute: Reflect.get(route, 'modernLocalisedRoute'),
         path: route.path,
         id: route.id,
         loader: route.loader,
@@ -38,6 +39,7 @@ function toTanstackRouteObject(route, globalApp) {
     if ('function' != typeof route.component && 'object' != typeof route.component) return null;
     const LayoutComponent = withGlobalLayout(route.component, globalApp);
     return {
+        modernLocalisedRoute: Reflect.get(route, 'modernLocalisedRoute'),
         path: route.path,
         element: /*#__PURE__*/ react.createElement(LayoutComponent)
     };

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

@@ -1,4 +1,5 @@
-export declare function createModernBasepathRewrite(basepath: string, caseSensitive?: boolean): {
+import type { RouteObject } from '@modern-js/runtime-utils/router';
+export declare function createModernBasepathRewrite(basepath: string, caseSensitive?: boolean, routes?: RouteObject[]): {
     input: ({ url }: {
         url: URL;
     }) => URL;

package/package.json

@@ -18,7 +18,7 @@
     "modern.js",
     "tanstack-router"
   ],
-  "version": "3.9.0-ultramodern.2",
+  "version": "3.9.0-ultramodern.4",
   "engines": {
     "node": ">=20"
   },
@@ -94,17 +94,18 @@
     }
   },
   "dependencies": {
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.2",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.2",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.2",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.2",
+    "@modern-js/i18n-runtime-extensions": "npm:@bleedingdev/modern-js-i18n-runtime-extensions@3.9.0-ultramodern.4",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.4",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.4",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.4",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.4",
     "@swc/helpers": "^0.5.23",
     "@tanstack/react-router": "1.170.33",
     "@tanstack/router-core": "1.171.28"
   },
   "peerDependencies": {
-    "@modern-js/app-tools": "3.9.0-ultramodern.2",
-    "@modern-js/runtime": "3.9.0-ultramodern.2",
+    "@modern-js/app-tools": "3.9.0-ultramodern.4",
+    "@modern-js/runtime": "3.9.0-ultramodern.4",
     "react": "^19.2.8",
     "react-dom": "^19.2.8",
     "react-server-dom-rspack": "0.1.0"
@@ -115,8 +116,8 @@
     }
   },
   "devDependencies": {
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.9.0-ultramodern.2",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.9.0-ultramodern.2",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.9.0-ultramodern.4",
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.9.0-ultramodern.4",
     "@rslib/core": "1.0.0",
     "@scripts/rstest-config": "2.66.0",
     "@tanstack/history": "1.162.2",

package/rstest.config.mts

@@ -31,6 +31,7 @@ export default {
         'tests/router/generateRouteArtifacts.test.ts',
         'tests/router/hooks.test.ts',
         'tests/router/loaderBridge.test.ts',
+        'tests/router/localisedIdentity.test.tsx',
         'tests/router/packageSurface.test.ts',
         'tests/router/preloadRedirect.test.ts',
         'tests/router/register.test.ts',

package/src/cli/tanstackTypes/source.ts

@@ -5,6 +5,7 @@ import type {
   AppTools,
   AppToolsContext,
 } from '@modern-js/app-tools';
+import { canonicaliseLocalisedRoutes } from '@modern-js/i18n-runtime-extensions';
 import { makeLegalIdentifier } from '@modern-js/runtime/cli';
 import type { NestedRouteForCli, PageRoute } from '@modern-js/types';
 import { upath as path } from '@modern-js/utils';
@@ -45,8 +46,9 @@ export async function generateTanstackRouterTypesSourceForEntry(opts: {
     appContext,
     entryName,
     generatedDirName = 'modern-tanstack',
-    routes,
+    routes: rawRoutes,
   } = opts;
+  const routes: RouteForCli[] = canonicaliseLocalisedRoutes(rawRoutes);
   const outDir = path.join(
     appContext.srcDirectory,
     generatedDirName,

package/src/runtime/basepathRewrite.ts

@@ -1,4 +1,8 @@
 // @effect-diagnostics strictBooleanExpressions:off
+import { createLocalisedRouteRewrite } from '@modern-js/i18n-runtime-extensions';
+import type { RouteObject } from '@modern-js/runtime-utils/router';
+import { composeRewrites } from '@tanstack/react-router';
+
 function normalizeBasepath(basepath: string): string {
   if (!basepath) {
     return '/';
@@ -15,10 +19,12 @@ function normalizeBasepath(basepath: string): string {
 export function createModernBasepathRewrite(
   basepath: string,
   caseSensitive = false,
+  routes: RouteObject[] = [],
 ) {
+  const localisedRewrite = createLocalisedRouteRewrite(routes);
   const normalizedBasepath = normalizeBasepath(basepath);
   if (normalizedBasepath === '/') {
-    return undefined;
+    return localisedRewrite;
   }
 
   const normalizedBasepathWithSlash = `${normalizedBasepath}/`;
@@ -29,7 +35,7 @@ export function createModernBasepathRewrite(
     ? normalizedBasepathWithSlash
     : normalizedBasepathWithSlash.toLowerCase();
 
-  return {
+  const basepathRewrite = {
     input: ({ url }: { url: URL }) => {
       const pathname = caseSensitive
         ? url.pathname
@@ -57,4 +63,7 @@ export function createModernBasepathRewrite(
       return url;
     },
   };
+  return localisedRewrite
+    ? composeRewrites([basepathRewrite, localisedRewrite])
+    : basepathRewrite;
 }

package/src/runtime/plugin.node.tsx

@@ -35,6 +35,7 @@ import {
   type TanstackRouterPluginAPI,
   type TanstackRouterRuntimePlugin,
 } from './pluginShared';
+import { Link } from './prefetchLink';
 import {
   createRouteTreeFromRouteObjects,
   getModernRouteIdsFromMatches,
@@ -98,6 +99,8 @@ export const tanstackRouterPlugin = (
           return;
         }
 
+        context.router = { Link };
+
         const {
           request,
           nonce,
@@ -134,7 +137,11 @@ export const tanstackRouterPlugin = (
           initialEntries: [initialHref],
         });
 
-        const rewrite = createModernBasepathRewrite(_basename);
+        const rewrite = createModernBasepathRewrite(
+          _basename,
+          false,
+          modifiedRouteObjects,
+        );
         const routerLifecycleContext: RouterLifecycleContext = {
           framework: 'tanstack',
           phase: 'ssr-prepare',

package/src/runtime/plugin.tsx

@@ -149,7 +149,11 @@ export const tanstackRouterPlugin = (
         const history = supportHtml5History
           ? createBrowserHistory()
           : createHashHistory();
-        const rewrite = createModernBasepathRewrite(_basename);
+        const rewrite = createModernBasepathRewrite(
+          _basename,
+          false,
+          getRouteObjects(),
+        );
         const serializationAdapters = getGlobalEnableRsc()
           ? getTanstackRscSerializationAdapters()
           : undefined;

package/src/runtime/routeTree/construction.ts

@@ -1,5 +1,6 @@
 // @effect-diagnostics asyncFunction:off strictBooleanExpressions:off
 
+import { canonicaliseLocalisedRoutes } from '@modern-js/i18n-runtime-extensions';
 import { DefaultNotFound } from '@modern-js/runtime/context';
 import type { RouteObject } from '@modern-js/runtime-utils/router';
 import type { AnyRoute, AnyRouter } from '@tanstack/react-router';
@@ -121,6 +122,7 @@ export function createRouteTreeFromRouteObjects(
   routes: RouteObject[],
   options: RouteTreeOptions = {},
 ): ModernTanstackRootRoute {
+  routes = canonicaliseLocalisedRoutes(routes);
   const rootLikeRoute = getRootLikeRouteObject(routes) as
     | ModernRouteObject
     | undefined;

package/src/runtime/utils.tsx

@@ -54,6 +54,7 @@ function toTanstackRouteObject(
 ): RouteObject | null {
   if (route.type === 'nested') {
     return {
+      modernLocalisedRoute: Reflect.get(route, 'modernLocalisedRoute'),
       path: route.path,
       id: route.id,
       loader: route.loader,
@@ -91,9 +92,10 @@ function toTanstackRouteObject(
     globalApp,
   );
   return {
+    modernLocalisedRoute: Reflect.get(route, 'modernLocalisedRoute'),
     path: route.path,
     element: React.createElement(LayoutComponent),
-  };
+  } as ModernRouteObject;
 }
 
 export function createTanstackRouteObjectsFromConfig({

package/tests/router/cli.test.ts

@@ -624,7 +624,9 @@ describe('tanstack router cli plugin', () => {
     // the old `.replace('cjs', 'esm')` never matched the bundled dist/esm
     // runtime when the CLI was loaded through the ESM condition.
     expect(stringEntries[0]).toBe(path.resolve(__dirname, '..', '..'));
-    expect(stringEntries[0]).not.toContain('esm');
+    expect(stringEntries[0]).not.toMatch(
+      /[\\/]dist[\\/]esm(?:-node)?(?:[\\/]|$)/,
+    );
   });
 
   test('emits the plugin-i18n augmentation only when plugin-i18n is registered', async () => {

package/tests/router/localisedIdentity.test.tsx

@@ -0,0 +1,95 @@
+import { applyLocalisedUrlsToRoutes } from '@modern-js/i18n-runtime-extensions';
+import {
+  createMemoryHistory,
+  createRouter,
+  Outlet,
+  RouterProvider,
+  useLoaderData,
+  useParams,
+} from '@tanstack/react-router';
+import { createElement } from 'react';
+import { renderToString } from 'react-dom/server';
+import { createModernBasepathRewrite } from '../../src/runtime/basepathRewrite';
+import { createRouteTreeFromRouteObjects } from '../../src/runtime/routeTree';
+import { createTanstackRouteObjectsFromConfig } from '../../src/runtime/utils';
+
+function SearchPage() {
+  const data = useLoaderData({ from: '/$lang/search' }) as { language: string };
+  return createElement('p', null, `search:${data.language}`);
+}
+
+function ResourcePage() {
+  const params = useParams({ from: '/$lang/resources/$id' }) as { id: string };
+  return createElement('p', null, `resource:${params.id}`);
+}
+
+test('localized URLs preserve native loader and params route identity in SSR and navigation', async () => {
+  const routes = applyLocalisedUrlsToRoutes(
+    [
+      {
+        type: 'nested',
+        id: 'lang',
+        path: ':lang',
+        component: Outlet,
+        children: [
+          {
+            type: 'nested',
+            id: 'search',
+            path: 'search',
+            component: SearchPage,
+            loader: ({ params }: { params: { lang: string } }) => ({
+              language: params.lang,
+            }),
+          },
+          {
+            type: 'nested',
+            id: 'resource',
+            path: 'resources/:id',
+            component: ResourcePage,
+          },
+        ],
+      },
+    ],
+    ['en', 'cs'],
+    {
+      '/search': { en: '/find', cs: '/hledat' },
+      '/resources/:id': { en: '/resources/:id', cs: '/zdroje/:id' },
+    },
+  );
+  const routeObjects = createTanstackRouteObjectsFromConfig({
+    routesConfig: { routes },
+  })!;
+  const history = createMemoryHistory({
+    initialEntries: ['/base/cs/hledat?q=tractor#results'],
+  });
+  const router = createRouter({
+    context: {
+      request: new Request(
+        'https://example.test/base/cs/hledat?q=tractor#results',
+      ),
+    },
+    routeTree: createRouteTreeFromRouteObjects(routeObjects),
+    history,
+    rewrite: createModernBasepathRewrite('/base', false, routeObjects),
+  });
+  await router.load();
+  expect(router.state.matches.at(-1)?.routeId).toBe('/$lang/search');
+  expect(renderToString(createElement(RouterProvider, { router }))).toContain(
+    'search:cs',
+  );
+  expect(history.location.href).toBe('/base/cs/hledat?q=tractor#results');
+
+  await router.navigate({ to: '/en/search', search: { q: 'tractor' } });
+  expect(history.location.href).toBe('/base/en/find?q=tractor');
+  expect(router.state.matches.at(-1)?.routeId).toBe('/$lang/search');
+  expect(renderToString(createElement(RouterProvider, { router }))).toContain(
+    'search:en',
+  );
+
+  await router.navigate({ to: '/cs/zdroje/a%2Fb' });
+  expect(history.location.href).toBe('/base/cs/zdroje/a%2Fb');
+  expect(router.state.matches.at(-1)?.routeId).toBe('/$lang/resources/$id');
+  expect(renderToString(createElement(RouterProvider, { router }))).toContain(
+    'resource:a/b',
+  );
+});

package/tests/router/serverPlugin.test.ts

@@ -1,6 +1,12 @@
 import type { TInternalRuntimeContext } from '@modern-js/runtime/context';
 import { routerProviderRegistryHooks } from '@modern-js/runtime/context';
-import { getRouterServerSnapshot } from '../../src/runtime/lifecycle';
+import { type AnyRouter, RouterProvider } from '@tanstack/react-router';
+import { createElement } from 'react';
+import { renderToString } from 'react-dom/server';
+import {
+  getRouterRuntimeState,
+  getRouterServerSnapshot,
+} from '../../src/runtime/lifecycle';
 import { tanstackRouterPlugin } from '../../src/runtime/plugin.node';
 import type { TanstackRouterPluginAPI } from '../../src/runtime/pluginShared';
 import type { RouterConfig } from '../../src/runtime/types';
@@ -50,6 +56,42 @@ describe('tanstack server plugin router results', () => {
     rstest.restoreAllMocks();
   });
 
+  test.each([
+    '/cs/login',
+    '/en/login',
+  ])('renders native link active attributes during SSR at %s', async pathname => {
+    const { context } = createServerContext(pathname);
+    const beforeRender = collectBeforeRender(() => [
+      {
+        id: 'login',
+        path: '/:lang/login',
+        Component: () => {
+          const Link = context.router?.Link;
+          if (!Link) {
+            throw new Error('SSR router did not provide its native Link');
+          }
+          return createElement(Link, { to: '/cs' }, 'Home');
+        },
+      },
+    ]);
+    await beforeRender(context, value => value);
+
+    expect(context.router?.Link).toBeTypeOf('function');
+    const html = renderToString(
+      createElement(RouterProvider, {
+        router: getRouterRuntimeState(context)?.instance as AnyRouter,
+      }),
+    );
+    expect(html).toContain('href="/cs"');
+    if (pathname === '/cs/login') {
+      expect(html).toContain('data-status="active"');
+      expect(html).toContain('aria-current="page"');
+    } else {
+      expect(html).not.toContain('data-status="active"');
+      expect(html).not.toContain('aria-current="page"');
+    }
+  });
+
   test('uses the router render result as the HTTP and hydration status', async () => {
     const beforeRender = collectBeforeRender(() => [
       {