@bleedingdev/modern-js-plugin-tanstack 3.9.0-ultramodern.3 → 3.9.0-ultramodern.5

package/dist/cjs/cli/index.js

@@ -91,6 +91,15 @@ var __webpack_exports__ = {};
                 '@modern-js/runtime'
             ],
             setup: (api)=>{
+                const { srcDirectory, serverCompileExcludedFiles = [] } = api.getAppContext();
+                api.updateAppContext({
+                    serverCompileExcludedFiles: [
+                        ...new Set([
+                            ...serverCompileExcludedFiles,
+                            external_node_path_default().join(srcDirectory, generatedDirName, 'register.gen.d.ts')
+                        ])
+                    ]
+                });
                 const nestedRoutesForServer = {};
                 const isTanstackEntrypoint = (entrypoint)=>{
                     const { getEntrypointRoutesDir } = getRuntimeRouterCli();

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/lifecycle.js

@@ -28,14 +28,14 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    applyRouterRuntimeState: ()=>context_namespaceObject.applyRouterRuntimeState,
-    applyRouterServerPrepareResult: ()=>context_namespaceObject.applyRouterServerPrepareResult,
-    createRouterRuntimeState: ()=>context_namespaceObject.createRouterRuntimeState,
-    createRouterServerSnapshot: ()=>context_namespaceObject.createRouterServerSnapshot,
-    getRouterRuntimeState: ()=>context_namespaceObject.getRouterRuntimeState,
-    getRouterServerSnapshot: ()=>context_namespaceObject.getRouterServerSnapshot
+    applyRouterRuntimeState: ()=>router_state_namespaceObject.applyRouterRuntimeState,
+    applyRouterServerPrepareResult: ()=>router_state_namespaceObject.applyRouterServerPrepareResult,
+    createRouterRuntimeState: ()=>router_state_namespaceObject.createRouterRuntimeState,
+    createRouterServerSnapshot: ()=>router_state_namespaceObject.createRouterServerSnapshot,
+    getRouterRuntimeState: ()=>router_state_namespaceObject.getRouterRuntimeState,
+    getRouterServerSnapshot: ()=>router_state_namespaceObject.getRouterServerSnapshot
 });
-const context_namespaceObject = require("@modern-js/runtime/context");
+const router_state_namespaceObject = require("@modern-js/runtime-extensions/router-state");
 exports.applyRouterRuntimeState = __webpack_exports__.applyRouterRuntimeState;
 exports.applyRouterServerPrepareResult = __webpack_exports__.applyRouterServerPrepareResult;
 exports.createRouterRuntimeState = __webpack_exports__.createRouterRuntimeState;

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/prefetchLink.js

@@ -32,19 +32,14 @@ __webpack_require__.d(__webpack_exports__, {
     NavLink: ()=>NavLink
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
+const runtime_extensions_namespaceObject = require("@modern-js/runtime-extensions");
 const react_router_namespaceObject = require("@tanstack/react-router");
-function resolvePreloadFromPrefetch(prefetch, preload) {
-    if (void 0 !== preload) return preload;
-    if ('none' === prefetch) return false;
-    if ('intent' === prefetch || 'render' === prefetch || 'viewport' === prefetch) return prefetch;
-    return 'viewport';
-}
 const LinkComponentImpl = (props)=>{
     const { prefetch, preload, 'aria-current': ariaCurrentProp, ref, children, ...rest } = props;
     const hasAriaCurrentOverride = 'aria-current' in props;
     const linkOptions = {
         ...rest,
-        preload: resolvePreloadFromPrefetch(prefetch, preload)
+        preload: (0, runtime_extensions_namespaceObject.resolvePreloadFromPrefetch)(prefetch, preload)
     };
     const linkProps = (0, react_router_namespaceObject.useLinkProps)(linkOptions, ref);
     const { disabled: _disabled, type: _type, ...anchorProps } = linkProps;

package/dist/cjs/runtime/register.js

@@ -30,10 +30,10 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     tanstackRouterProviderFactory: ()=>tanstackRouterProviderFactory
 });
-const context_namespaceObject = require("@modern-js/runtime/context");
+const router_provider_namespaceObject = require("@modern-js/runtime-extensions/router-provider");
 const external_plugin_js_namespaceObject = require("./plugin.js");
 const tanstackRouterProviderFactory = (userConfig)=>(0, external_plugin_js_namespaceObject.tanstackRouterPlugin)(userConfig);
-(0, context_namespaceObject.registerRouterProvider)('tanstack', tanstackRouterProviderFactory);
+(0, router_provider_namespaceObject.registerRouterProvider)('tanstack', tanstackRouterProviderFactory);
 exports.tanstackRouterProviderFactory = __webpack_exports__.tanstackRouterProviderFactory;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "tanstackRouterProviderFactory"

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/router.js

@@ -30,21 +30,37 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     routerPlugin: ()=>routerPlugin
 });
+const context_namespaceObject = require("@modern-js/runtime/context");
 const internal_namespaceObject = require("@modern-js/runtime/router/internal");
+const router_provider_namespaceObject = require("@modern-js/runtime-extensions/router-provider");
+const router_state_plugin_namespaceObject = require("@modern-js/runtime-extensions/router-state-plugin");
 const external_register_js_namespaceObject = require("./register.js");
-function getRouterPlugin() {
-    const createRouterPlugin = Reflect.get(internal_namespaceObject, 'createRouterPlugin');
-    if ('function' == typeof createRouterPlugin) return createRouterPlugin([
+const createProviderPlugin = (0, router_provider_namespaceObject.createRouterPlugin)({
+    defaultProvider: {
+        name: 'react-router',
+        factory: internal_namespaceObject.routerPlugin
+    },
+    registryHooks: context_namespaceObject.routerProviderRegistryHooks,
+    localProviders: [
         {
             name: 'tanstack',
             factory: external_register_js_namespaceObject.tanstackRouterProviderFactory
         }
-    ]);
-    const legacyRouterPlugin = Reflect.get(internal_namespaceObject, 'routerPlugin');
-    if ('function' == typeof legacyRouterPlugin) return external_register_js_namespaceObject.tanstackRouterProviderFactory;
-    throw new Error('[@modern-js/plugin-tanstack] The installed @modern-js/runtime/router/internal exports neither createRouterPlugin nor routerPlugin. Install a compatible @modern-js/runtime version.');
-}
-const routerPlugin = getRouterPlugin();
+    ]
+});
+const statePlugin = (0, router_state_plugin_namespaceObject.createRouterStatePlugin)({
+    registryHooks: context_namespaceObject.routerProviderRegistryHooks
+});
+const routerPlugin = (userConfig = {})=>{
+    const providerPlugin = createProviderPlugin(userConfig);
+    return {
+        ...providerPlugin,
+        setup (api) {
+            statePlugin.setup(api);
+            providerPlugin.setup(api);
+        }
+    };
+};
 exports.routerPlugin = __webpack_exports__.routerPlugin;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "routerPlugin"

package/dist/cjs/runtime/state.js

@@ -30,9 +30,9 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     getTanstackRouterState: ()=>getTanstackRouterState
 });
-const context_namespaceObject = require("@modern-js/runtime/context");
+const router_state_namespaceObject = require("@modern-js/runtime-extensions/router-state");
 function getTanstackRouterState(context) {
-    const state = (0, context_namespaceObject.getRouterRuntimeState)(context);
+    const state = (0, router_state_namespaceObject.getRouterRuntimeState)(context);
     if (void 0 === state || 'tanstack' !== state.framework || void 0 === state.instance) return;
     return state;
 }

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/index.mjs

@@ -31,6 +31,15 @@ function tanstackRouterPlugin(options = {}) {
             '@modern-js/runtime'
         ],
         setup: (api)=>{
+            const { srcDirectory, serverCompileExcludedFiles = [] } = api.getAppContext();
+            api.updateAppContext({
+                serverCompileExcludedFiles: [
+                    ...new Set([
+                        ...serverCompileExcludedFiles,
+                        node_path.join(srcDirectory, generatedDirName, 'register.gen.d.ts')
+                    ])
+                ]
+            });
             const nestedRoutesForServer = {};
             const isTanstackEntrypoint = (entrypoint)=>{
                 const { getEntrypointRoutesDir } = getRuntimeRouterCli();

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/lifecycle.mjs

@@ -1 +1 @@
-export { applyRouterRuntimeState, applyRouterServerPrepareResult, createRouterRuntimeState, createRouterServerSnapshot, getRouterRuntimeState, getRouterServerSnapshot } from "@modern-js/runtime/context";
+export { applyRouterRuntimeState, applyRouterServerPrepareResult, createRouterRuntimeState, createRouterServerSnapshot, getRouterRuntimeState, getRouterServerSnapshot } from "@modern-js/runtime-extensions/router-state";

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/prefetchLink.mjs

@@ -1,11 +1,6 @@
 import { jsx } from "react/jsx-runtime";
+import { resolvePreloadFromPrefetch } from "@modern-js/runtime-extensions";
 import { useLinkProps } from "@tanstack/react-router";
-function resolvePreloadFromPrefetch(prefetch, preload) {
-    if (void 0 !== preload) return preload;
-    if ('none' === prefetch) return false;
-    if ('intent' === prefetch || 'render' === prefetch || 'viewport' === prefetch) return prefetch;
-    return 'viewport';
-}
 const LinkComponentImpl = (props)=>{
     const { prefetch, preload, 'aria-current': ariaCurrentProp, ref, children, ...rest } = props;
     const hasAriaCurrentOverride = 'aria-current' in props;

package/dist/esm/runtime/register.mjs

@@ -1,4 +1,4 @@
-import { registerRouterProvider } from "@modern-js/runtime/context";
+import { registerRouterProvider } from "@modern-js/runtime-extensions/router-provider";
 import { tanstackRouterPlugin } from "./plugin.mjs";
 const tanstackRouterProviderFactory = (userConfig)=>tanstackRouterPlugin(userConfig);
 registerRouterProvider('tanstack', tanstackRouterProviderFactory);

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/router.mjs

@@ -1,16 +1,32 @@
-import * as __rspack_external__modern_js_runtime_router_internal_8b8183c5 from "@modern-js/runtime/router/internal";
+import { routerProviderRegistryHooks } from "@modern-js/runtime/context";
+import { routerPlugin } from "@modern-js/runtime/router/internal";
+import { createRouterPlugin } from "@modern-js/runtime-extensions/router-provider";
+import { createRouterStatePlugin } from "@modern-js/runtime-extensions/router-state-plugin";
 import { tanstackRouterProviderFactory } from "./register.mjs";
-function getRouterPlugin() {
-    const createRouterPlugin = Reflect.get(__rspack_external__modern_js_runtime_router_internal_8b8183c5, 'createRouterPlugin');
-    if ('function' == typeof createRouterPlugin) return createRouterPlugin([
+const createProviderPlugin = createRouterPlugin({
+    defaultProvider: {
+        name: 'react-router',
+        factory: routerPlugin
+    },
+    registryHooks: routerProviderRegistryHooks,
+    localProviders: [
         {
             name: 'tanstack',
             factory: tanstackRouterProviderFactory
         }
-    ]);
-    const legacyRouterPlugin = Reflect.get(__rspack_external__modern_js_runtime_router_internal_8b8183c5, 'routerPlugin');
-    if ('function' == typeof legacyRouterPlugin) return tanstackRouterProviderFactory;
-    throw new Error('[@modern-js/plugin-tanstack] The installed @modern-js/runtime/router/internal exports neither createRouterPlugin nor routerPlugin. Install a compatible @modern-js/runtime version.');
-}
-const routerPlugin = getRouterPlugin();
-export { routerPlugin };
+    ]
+});
+const statePlugin = createRouterStatePlugin({
+    registryHooks: routerProviderRegistryHooks
+});
+const router_routerPlugin = (userConfig = {})=>{
+    const providerPlugin = createProviderPlugin(userConfig);
+    return {
+        ...providerPlugin,
+        setup (api) {
+            statePlugin.setup(api);
+            providerPlugin.setup(api);
+        }
+    };
+};
+export { router_routerPlugin as routerPlugin };

package/dist/esm/runtime/state.mjs

@@ -1,4 +1,4 @@
-import { getRouterRuntimeState } from "@modern-js/runtime/context";
+import { getRouterRuntimeState } from "@modern-js/runtime-extensions/router-state";
 function getTanstackRouterState(context) {
     const state = getRouterRuntimeState(context);
     if (void 0 === state || 'tanstack' !== state.framework || void 0 === state.instance) return;

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/index.mjs

@@ -37,6 +37,15 @@ function tanstackRouterPlugin(options = {}) {
             '@modern-js/runtime'
         ],
         setup: (api)=>{
+            const { srcDirectory, serverCompileExcludedFiles = [] } = api.getAppContext();
+            api.updateAppContext({
+                serverCompileExcludedFiles: [
+                    ...new Set([
+                        ...serverCompileExcludedFiles,
+                        node_path.join(srcDirectory, generatedDirName, 'register.gen.d.ts')
+                    ])
+                ]
+            });
             const nestedRoutesForServer = {};
             const isTanstackEntrypoint = (entrypoint)=>{
                 const { getEntrypointRoutesDir } = getRuntimeRouterCli();

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/lifecycle.mjs

@@ -1,2 +1,2 @@
 import "node:module";
-export { applyRouterRuntimeState, applyRouterServerPrepareResult, createRouterRuntimeState, createRouterServerSnapshot, getRouterRuntimeState, getRouterServerSnapshot } from "@modern-js/runtime/context";
+export { applyRouterRuntimeState, applyRouterServerPrepareResult, createRouterRuntimeState, createRouterServerSnapshot, getRouterRuntimeState, getRouterServerSnapshot } from "@modern-js/runtime-extensions/router-state";

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/prefetchLink.mjs

@@ -1,12 +1,7 @@
 import "node:module";
 import { jsx } from "react/jsx-runtime";
+import { resolvePreloadFromPrefetch } from "@modern-js/runtime-extensions";
 import { useLinkProps } from "@tanstack/react-router";
-function resolvePreloadFromPrefetch(prefetch, preload) {
-    if (void 0 !== preload) return preload;
-    if ('none' === prefetch) return false;
-    if ('intent' === prefetch || 'render' === prefetch || 'viewport' === prefetch) return prefetch;
-    return 'viewport';
-}
 const LinkComponentImpl = (props)=>{
     const { prefetch, preload, 'aria-current': ariaCurrentProp, ref, children, ...rest } = props;
     const hasAriaCurrentOverride = 'aria-current' in props;

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

@@ -1,5 +1,5 @@
 import "node:module";
-import { registerRouterProvider } from "@modern-js/runtime/context";
+import { registerRouterProvider } from "@modern-js/runtime-extensions/router-provider";
 import { tanstackRouterPlugin } from "./plugin.mjs";
 const tanstackRouterProviderFactory = (userConfig)=>tanstackRouterPlugin(userConfig);
 registerRouterProvider('tanstack', tanstackRouterProviderFactory);