@bleedingdev/modern-js-plugin-tanstack 3.2.0-ultramodern.99 → 3.4.0-ultramodern.0

package/dist/esm/runtime/routeTree.mjs

@@ -1,6 +1,8 @@
-import { createRootRoute, createRoute, notFound, redirect } from "@tanstack/react-router";
+import { DefaultNotFound } from "@modern-js/runtime/context";
+import { createRootRoute, createRoute, notFound, rootRouteId } from "@tanstack/react-router";
 import { createElement } from "react";
-import { DefaultNotFound } from "./DefaultNotFound.mjs";
+import { isRedirectResponse, isResponse, isTanstackRedirect, throwTanstackRedirect } from "./loaderBridge.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;
@@ -20,23 +26,6 @@ function toTanstackPath(pathname) {
         return segment;
     }).join('/');
 }
-function isResponse(value) {
-    const record = value;
-    return null != record && 'object' == typeof record && 'number' == typeof record.status && 'object' == typeof record.headers;
-}
-function isTanstackRedirect(value) {
-    return isResponse(value) && 'object' == typeof value.options;
-}
-const redirectStatusCodes = new Set([
-    301,
-    302,
-    303,
-    307,
-    308
-]);
-function isRedirectResponse(res) {
-    return redirectStatusCodes.has(res.status);
-}
 function isModernDeferredData(value) {
     if (!value || 'object' != typeof value) return false;
     const deferred = value;
@@ -89,34 +78,6 @@ function createServerLazyImportComponent(lazyImport, fallbackComponent) {
     Component.preload = load;
     return Component;
 }
-function isAbsoluteUrl(value) {
-    try {
-        new URL(value);
-        return true;
-    } catch  {
-        return false;
-    }
-}
-function throwTanstackRedirect(location) {
-    const target = location || '/';
-    if (isAbsoluteUrl(target)) throw redirect({
-        href: target
-    });
-    throw redirect({
-        to: target
-    });
-}
-function mapParamsForModernLoader({ modernRoute, params }) {
-    if ('nested' === modernRoute.type && modernRoute.path?.includes('*')) {
-        const { _splat, ...rest } = params;
-        if (void 0 !== _splat) return {
-            ...rest,
-            '*': _splat
-        };
-        return rest;
-    }
-    return params;
-}
 function createModernRequest(input, signal) {
     return new Request(input, {
         signal
@@ -150,52 +111,6 @@ function createModernShouldReload(shouldRevalidate, state) {
         return 'boolean' == typeof result ? result : void 0;
     };
 }
-function wrapModernLoader(modernRoute, modernLoader, revalidationState, options = {}) {
-    const route = modernRoute;
-    return async (ctx)=>{
-        try {
-            if (revalidationState) rememberRouteLocation(revalidationState, ctx);
-            if ('function' == typeof route.lazyImport) try {
-                await route.lazyImport();
-            } catch  {}
-            const signal = ctx?.abortController?.signal || ctx?.signal || new AbortController().signal;
-            const baseRequest = ctx?.context?.request instanceof Request ? ctx.context.request : void 0;
-            const href = 'string' == typeof ctx?.location ? ctx.location : ctx?.location?.publicHref || ctx?.location?.href || ctx?.location?.url?.href || '';
-            const request = void 0 !== baseRequest ? new Request(baseRequest, {
-                signal
-            }) : createModernRequest(href, signal);
-            const params = mapParamsForModernLoader({
-                modernRoute,
-                params: ctx.params || {}
-            });
-            const loadModernData = async ()=>{
-                const result = modernLoader ? await modernLoader({
-                    request,
-                    params,
-                    context: ctx?.context?.requestContext
-                }) : null;
-                return normalizeModernLoaderResponse(result);
-            };
-            if (options.rscPayloadRouter && isTanstackRscPayloadNavigationEnabled()) return loadTanstackRscRouteData({
-                hasClientLoader: route.hasClientLoader || void 0 !== route.clientData,
-                loadClientData: loadModernData,
-                request,
-                routeId: ctx.route?.id
-            });
-            return loadModernData();
-        } catch (err) {
-            if (isResponse(err)) {
-                if (isTanstackRedirect(err)) throw err;
-                if (isRedirectResponse(err)) {
-                    const location = err.headers.get('Location') || '/';
-                    throwTanstackRedirect(location);
-                }
-                if (404 === err.status) throw notFound();
-            }
-            throw err;
-        }
-    };
-}
 function isRouteObjectPathlessLayout(route) {
     return !route.path && !route.index;
 }
@@ -270,11 +185,6 @@ function toRouteComponent(routeObject) {
     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;
@@ -312,9 +222,10 @@ 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),
         validateSearch: modernRouteObject.validateSearch,
@@ -337,6 +248,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({
@@ -348,103 +260,6 @@ function createRouteFromRouteObject(opts) {
     }
     return route;
 }
-function createRouteFromModernRoute(opts) {
-    const { options = {}, parent, modernRoute } = opts;
-    const route = modernRoute;
-    const revalidationState = {};
-    const modernId = route.id;
-    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 = toModernRouteComponent(route);
-    const modernLoader = route.loader;
-    const modernAction = route.action;
-    const modernShouldRevalidate = route.shouldRevalidate;
-    const shouldReload = createModernShouldReload(modernShouldRevalidate, revalidationState);
-    const isPathlessLayout = 'nested' === route.type && 'boolean' != typeof route.index && void 0 === route.path;
-    const isIndexRoute = 'nested' === route.type && Boolean(route.index);
-    const base = {
-        getParentRoute: ()=>parent,
-        component: component || void 0,
-        pendingComponent: pendingComponent || void 0,
-        errorComponent: errorComponent || void 0,
-        validateSearch: route.validateSearch,
-        loaderDeps: route.loaderDeps,
-        staticData: createRouteStaticData({
-            modernRouteId: modernId,
-            modernRouteAction: modernAction,
-            modernRouteHandle: mergeModernRouteHandle(route),
-            modernRouteHasAction: route.hasAction || Boolean(modernAction),
-            modernRouteHasClientLoader: route.hasClientLoader || void 0 !== route.clientData,
-            modernRouteHasLoader: route.hasLoader || 'function' == typeof modernLoader,
-            modernRouteIsClientComponent: route.isClientComponent,
-            modernRouteLoader: modernLoader,
-            modernRouteShouldRevalidate: modernShouldRevalidate
-        }),
-        loader: wrapModernLoader(modernRoute, modernLoader, revalidationState, options)
-    };
-    if (route.inValidSSRRoute) base.ssr = false;
-    if (shouldReload) base.shouldReload = shouldReload;
-    if (isPathlessLayout) base.id = stableFallbackId || 'pathless';
-    else {
-        const rawPath = route.path;
-        base.path = isIndexRoute ? '/' : toTanstackPath(rawPath || '');
-    }
-    const tanstackRoute = createTanstackRoute(base);
-    const children = route.children;
-    if (children && children.length > 0) {
-        const childRoutes = children.map((child)=>createRouteFromModernRoute({
-                options,
-                parent: tanstackRoute,
-                modernRoute: child
-            }));
-        tanstackRoute.addChildren(childRoutes);
-    }
-    return tanstackRoute;
-}
-function createRouteTreeFromModernRoutes(routes, options = {}) {
-    const rootModern = routes.find((r)=>r && 'nested' === r.type && r.isRoot);
-    const rootComponent = rootModern ? toModernRouteComponent(rootModern) : void 0;
-    const pendingComponent = rootModern?.loading;
-    const errorComponent = rootModern?.error;
-    const rootLoader = rootModern?.loader;
-    const rootAction = rootModern?.action;
-    const rootModernId = rootModern?.id;
-    const rootShouldRevalidate = rootModern?.shouldRevalidate;
-    const rootRevalidationState = {};
-    const rootShouldReload = createModernShouldReload(rootShouldRevalidate, rootRevalidationState);
-    const rootRouteOptions = {
-        component: rootComponent || void 0,
-        pendingComponent: pendingComponent || void 0,
-        errorComponent: errorComponent || void 0,
-        validateSearch: rootModern?.validateSearch,
-        loaderDeps: rootModern?.loaderDeps,
-        notFoundComponent: DefaultNotFound,
-        staticData: createRouteStaticData({
-            modernRouteId: rootModernId,
-            modernRouteAction: rootAction,
-            modernRouteHandle: rootModern ? mergeModernRouteHandle(rootModern) : void 0,
-            modernRouteHasAction: rootModern?.hasAction || Boolean(rootAction),
-            modernRouteHasClientLoader: rootModern?.hasClientLoader || void 0 !== rootModern?.clientData,
-            modernRouteHasLoader: rootModern?.hasLoader || 'function' == typeof rootLoader,
-            modernRouteIsClientComponent: rootModern?.isClientComponent,
-            modernRouteLoader: rootLoader,
-            modernRouteShouldRevalidate: rootShouldRevalidate
-        }),
-        loader: rootModern ? wrapModernLoader(rootModern, rootLoader, rootRevalidationState, options) : void 0
-    };
-    if (rootShouldReload) rootRouteOptions.shouldReload = rootShouldReload;
-    if (rootModern?.inValidSSRRoute) rootRouteOptions.ssr = false;
-    const rootRoute = createTanstackRootRoute(rootRouteOptions);
-    const topLevel = rootModern ? rootModern.children || [] : routes;
-    const childRoutes = topLevel.map((child)=>createRouteFromModernRoute({
-            options,
-            parent: rootRoute,
-            modernRoute: child
-        }));
-    rootRoute.addChildren(childRoutes);
-    return rootRoute;
-}
 function getRootLikeRouteObject(routes) {
     return routes.find((route)=>'/' === route.path && !route.index);
 }
@@ -453,8 +268,9 @@ 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,
         validateSearch: rootLikeRoute?.validateSearch,
@@ -476,6 +292,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)
@@ -498,4 +315,4 @@ function getModernRouteIdsFromMatches(router) {
     }).filter((id)=>'string' == typeof id);
     return Array.from(new Set(ids));
 }
-export { createRouteTreeFromModernRoutes, createRouteTreeFromRouteObjects, getModernRouteIdsFromMatches };
+export { createRouteTreeFromRouteObjects, getModernRouteIdsFromMatches };

package/dist/esm/runtime/router.mjs

@@ -0,0 +1,2 @@
+import "./register.mjs";
+export { routerPlugin } from "@modern-js/runtime/router/internal";

package/dist/esm/runtime/rsc/payloadRouter.mjs

@@ -1,3 +1,4 @@
+import { isRouteErrorResponse } from "@modern-js/runtime-utils/router";
 import { notFound, redirect } from "@tanstack/react-router";
 const payloadFetchCache = new Map();
 let payloadDecoder;
@@ -37,6 +38,39 @@ function toPayloadRoute(match) {
         pathnameBase: 'string' == typeof match.pathnameBase ? match.pathnameBase : pathname
     };
 }
+function shouldRedactServerError(status = 500) {
+    return status >= 500 && 'development' !== process.env.NODE_ENV && 'test' !== process.env.NODE_ENV;
+}
+function serializePayloadError(error) {
+    if (isRouteErrorResponse(error)) {
+        if (shouldRedactServerError(error.status)) return {
+            status: error.status,
+            statusText: 'Internal Server Error',
+            data: 'Unexpected Server Error',
+            __type: 'RouteErrorResponse'
+        };
+        return {
+            ...error,
+            __type: 'RouteErrorResponse'
+        };
+    }
+    if (error instanceof Error) {
+        if (shouldRedactServerError()) return {
+            message: 'Unexpected Server Error',
+            stack: void 0,
+            __type: 'Error'
+        };
+        return {
+            message: error.message,
+            stack: error.stack,
+            __type: 'Error',
+            ...'Error' !== error.name ? {
+                __subType: error.name
+            } : {}
+        };
+    }
+    return error;
+}
 function createTanstackRscServerPayload(router, options = {}) {
     const matches = Array.isArray(router.state?.matches) ? router.state.matches : [];
     const routes = [];
@@ -47,7 +81,7 @@ function createTanstackRscServerPayload(router, options = {}) {
         if (payloadRoute) {
             routes.push(payloadRoute);
             if ('loaderData' in match && void 0 !== match.loaderData && !(options.omitClientLoaderData && payloadRoute.hasClientLoader)) loaderData[payloadRoute.id] = match.loaderData;
-            if (void 0 !== match.error) errors[payloadRoute.id] = match.error;
+            if (void 0 !== match.error) errors[payloadRoute.id] = serializePayloadError(match.error);
         }
     }
     return {

package/dist/esm/runtime/state.mjs

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

package/dist/esm/runtime/utils.mjs

@@ -1,6 +1,5 @@
 import { jsx } from "react/jsx-runtime";
 import react from "react";
-import { DefaultNotFound } from "./DefaultNotFound.mjs";
 function getRouteObjects(routes, { globalApp, ssrMode, props }) {
     const createLayoutElement = (Component)=>{
         const GlobalLayout = globalApp;
@@ -21,7 +20,6 @@ function getRouteObjects(routes, { globalApp, ssrMode, props }) {
             id: route.id,
             loader: route.loader,
             action: route.action,
-            hasErrorBoundary: route.hasErrorBoundary,
             shouldRevalidate: route.shouldRevalidate,
             handle: {
                 ...route.handle,
@@ -57,10 +55,6 @@ function getRouteObjects(routes, { globalApp, ssrMode, props }) {
         };
         routeObjects.push(routeObject);
     }
-    routeObjects.push({
-        path: '*',
-        element: /*#__PURE__*/ jsx(DefaultNotFound, {})
-    });
     return routeObjects;
 }
 function createRouteObjectsFromConfig({ routesConfig, props, ssrMode }) {

package/dist/esm-node/cli/index.mjs

@@ -1,14 +1,14 @@
 import "node:module";
 import node_path from "node:path";
 import { NESTED_ROUTE_SPEC_FILE, filterRoutesForServer, fs } from "@modern-js/utils";
-import { createTanstackRsbuildRouteSplittingProfile, isTanstackStartRouteModuleSource, resolveTanstackRouteCodeSplittingEnabled } from "./routeSplitting.mjs";
-import { generateTanstackRouterTypesSourceForEntry, isTanstackRouterFrameworkEnabled } from "./tanstackTypes.mjs";
+import { createTanstackRsbuildRouteSplittingProfile, resolveTanstackRouteCodeSplittingEnabled } from "./routeSplitting.mjs";
+import { collectCanonicalRoutesForEntry, generateTanstackRouterTypesSourceForEntry } from "./tanstackTypes.mjs";
 import { __webpack_require__ } from "../rslib-runtime.mjs";
 import { fileURLToPath as __rspack_fileURLToPath } from "node:url";
 import { dirname as __rspack_dirname } from "node:path";
 import * as __rspack_external__modern_js_runtime_cli_401ee077 from "@modern-js/runtime/cli";
 __webpack_require__.add({
-    "@modern-js/runtime/cli" (module) {
+    "@modern-js/runtime/cli?9b14" (module) {
         module.exports = __rspack_external__modern_js_runtime_cli_401ee077;
     }
 });
@@ -19,8 +19,8 @@ const ENTRYPOINTS_KEY = '@modern-js/plugin-tanstack';
 let runtimeRouterCli;
 function getRuntimeRouterCli() {
     if (runtimeRouterCli) return runtimeRouterCli;
-    const cli = __webpack_require__("@modern-js/runtime/cli");
-    if (cli.handleGeneratorEntryCode && cli.getEntrypointRoutesDir) {
+    const cli = __webpack_require__("@modern-js/runtime/cli?9b14");
+    if (cli.handleGeneratorEntryCode && cli.getEntrypointRoutesDir && cli.getEntrypointRoutesOwner) {
         runtimeRouterCli = cli;
         return runtimeRouterCli;
     }
@@ -36,6 +36,14 @@ async function writeFileIfChanged(filePath, content) {
 function createRegisterDtsContent(opts) {
     const importStatements = opts.entries.map((entryName, index)=>`import type { router as router${index} } from './${entryName}/router.gen';`).join('\n');
     const routerUnionType = opts.entries.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}
@@ -45,19 +53,21 @@ declare module '${opts.runtimeModule}' {
     router: ${routerUnionType};
   }
 }
-`;
+${canonicalRoutesAugmentation}`;
 }
 async function writeTanstackRegisterFile(opts) {
-    const { entries, generatedDirName = DEFAULT_GENERATED_DIR_NAME, runtimeModule = '@modern-js/plugin-tanstack/runtime', srcDirectory } = opts;
+    const { entries, generatedDirName = DEFAULT_GENERATED_DIR_NAME, runtimeModule = '@modern-js/plugin-tanstack/runtime', srcDirectory, canonicalRoutes, i18nRuntimeModule } = opts;
     if (0 === entries.length) return;
     const registerDtsPath = node_path.join(srcDirectory, generatedDirName, 'register.gen.d.ts');
     await writeFileIfChanged(registerDtsPath, createRegisterDtsContent({
         entries,
-        runtimeModule
+        runtimeModule,
+        canonicalRoutes,
+        i18nRuntimeModule
     }));
 }
 async function writeTanstackRouterTypesForEntries(opts) {
-    const { appContext, generatedDirName = DEFAULT_GENERATED_DIR_NAME, routesByEntry } = opts;
+    const { appContext, generatedDirName = DEFAULT_GENERATED_DIR_NAME, routesByEntry, i18nPluginInstalled = false } = opts;
     const entryNames = Object.keys(routesByEntry);
     await Promise.all(entryNames.map(async (entryName)=>{
         const { routerGenTs } = await generateTanstackRouterTypesSourceForEntry({
@@ -74,10 +84,21 @@ async function writeTanstackRouterTypesForEntries(opts) {
         if (mainEntryName && b === mainEntryName) return 1;
         return a.localeCompare(b);
     });
+    let canonicalRoutes = null;
+    if (i18nPluginInstalled) for (const entryName of registerEntries){
+        const entryCanonicalRoutes = collectCanonicalRoutesForEntry(routesByEntry[entryName], {
+            localeParamHeuristic: true
+        });
+        if (entryCanonicalRoutes) canonicalRoutes = {
+            ...entryCanonicalRoutes,
+            ...canonicalRoutes ?? {}
+        };
+    }
     await writeTanstackRegisterFile({
         entries: registerEntries,
         generatedDirName,
-        srcDirectory: appContext.srcDirectory
+        srcDirectory: appContext.srcDirectory,
+        canonicalRoutes
     });
 }
 function tanstackRouterPlugin(options = {}) {
@@ -95,16 +116,42 @@ function tanstackRouterPlugin(options = {}) {
                 const { getEntrypointRoutesDir } = getRuntimeRouterCli();
                 return getEntrypointRoutesDir(entrypoint) === routesDir;
             };
+            const isForeignRouteEntrypoint = (entrypoint)=>{
+                const { getEntrypointRoutesDir, getEntrypointRoutesOwner } = getRuntimeRouterCli();
+                if (getEntrypointRoutesOwner(entrypoint)) return true;
+                if (entrypoint.pageRoutesEntry) return true;
+                return null !== getEntrypointRoutesDir(entrypoint);
+            };
+            const isI18nPluginInstalled = ()=>{
+                const { plugins } = api.getAppContext();
+                return Boolean(plugins?.some((plugin)=>plugin?.name === '@modern-js/plugin-i18n'));
+            };
             api._internalRuntimePlugins(({ entrypoint, plugins })=>{
-                if (!isTanstackEntrypoint(entrypoint)) return {
+                const { metaName, serverRoutes } = api.getAppContext();
+                const serverBase = serverRoutes.filter((route)=>route.entryName === entrypoint.entryName).map((route)=>route.urlPath).sort((a, b)=>a.length - b.length > 0 ? -1 : 1);
+                if (isTanstackEntrypoint(entrypoint)) {
+                    plugins.push({
+                        name: 'tanstackRouter',
+                        path: `@${metaName}/plugin-tanstack/runtime`,
+                        config: {
+                            serverBase
+                        }
+                    });
+                    return {
+                        entrypoint,
+                        plugins
+                    };
+                }
+                if (isForeignRouteEntrypoint(entrypoint)) return {
                     entrypoint,
                     plugins
                 };
-                const { metaName, serverRoutes } = api.getAppContext();
-                const serverBase = serverRoutes.filter((route)=>route.entryName === entrypoint.entryName).map((route)=>route.urlPath).sort((a, b)=>a.length - b.length > 0 ? -1 : 1);
-                plugins.push({
-                    name: 'tanstackRouter',
-                    path: `@${metaName}/plugin-tanstack/runtime`,
+                const routerWrapperPath = `@${metaName}/plugin-tanstack/runtime/router`;
+                const existingRouterPlugin = plugins.find((plugin)=>'router' === plugin.name);
+                if (existingRouterPlugin) existingRouterPlugin.path = routerWrapperPath;
+                else plugins.push({
+                    name: 'router',
+                    path: routerWrapperPath,
                     config: {
                         serverBase
                     }
@@ -123,7 +170,9 @@ function tanstackRouterPlugin(options = {}) {
                     source: {
                         include: [
                             /[\\/]node_modules[\\/]@tanstack[\\/]react-router[\\/]/,
-                            node_path.resolve(cli_dirname, '../runtime').replace('cjs', 'esm')
+                            /[\\/]node_modules[\\/]@tanstack[\\/]router-core[\\/]/,
+                            /[\\/]node_modules[\\/]@tanstack[\\/]react-store[\\/]/,
+                            node_path.resolve(cli_dirname, '..', '..')
                         ]
                     }
                 }));
@@ -140,15 +189,13 @@ function tanstackRouterPlugin(options = {}) {
                 if (0 === tanstackEntrypoints.length) return;
                 const { handleGeneratorEntryCode } = getRuntimeRouterCli();
                 const routesByEntry = await handleGeneratorEntryCode(api, tanstackEntrypoints, {
-                    entrypointsKey: ENTRYPOINTS_KEY,
-                    generateCodeOptions: {
-                        enableTanstackTypes: false
-                    }
+                    entrypointsKey: ENTRYPOINTS_KEY
                 });
                 await writeTanstackRouterTypesForEntries({
                     appContext: api.getAppContext(),
                     generatedDirName,
-                    routesByEntry
+                    routesByEntry,
+                    i18nPluginInstalled: isI18nPluginInstalled()
                 });
             });
             api.onFileChanged(async (event)=>{
@@ -162,15 +209,13 @@ function tanstackRouterPlugin(options = {}) {
                     regenerate: async ({ api, entrypoints })=>{
                         const { handleGeneratorEntryCode } = getRuntimeRouterCli();
                         const routesByEntry = await handleGeneratorEntryCode(api, entrypoints, {
-                            entrypointsKey: ENTRYPOINTS_KEY,
-                            generateCodeOptions: {
-                                enableTanstackTypes: false
-                            }
+                            entrypointsKey: ENTRYPOINTS_KEY
                         });
                         await writeTanstackRouterTypesForEntries({
                             appContext: api.getAppContext(),
                             generatedDirName,
-                            routesByEntry
+                            routesByEntry,
+                            i18nPluginInstalled: isI18nPluginInstalled()
                         });
                     }
                 });
@@ -202,4 +247,4 @@ function tanstackRouterPlugin(options = {}) {
 }
 const src_cli = tanstackRouterPlugin;
 export default src_cli;
-export { createTanstackRsbuildRouteSplittingProfile, generateTanstackRouterTypesSourceForEntry, isTanstackRouterFrameworkEnabled, isTanstackStartRouteModuleSource, resolveTanstackRouteCodeSplittingEnabled, tanstackRouterPlugin, writeTanstackRegisterFile, writeTanstackRouterTypesForEntries };
+export { collectCanonicalRoutesForEntry, createTanstackRsbuildRouteSplittingProfile, generateTanstackRouterTypesSourceForEntry, resolveTanstackRouteCodeSplittingEnabled, tanstackRouterPlugin, writeTanstackRegisterFile, writeTanstackRouterTypesForEntries };

package/dist/esm-node/cli/routeSplitting.mjs

@@ -1,13 +1,4 @@
 import "node:module";
-const TANSTACK_START_ROUTE_FACTORY_CALLS = [
-    'createFileRoute',
-    'createRootRoute',
-    'createRootRouteWithContext'
-];
-const TANSTACK_START_ROUTE_FACTORY_REGEX = /\b(createFileRoute|createRootRoute|createRootRouteWithContext)\s*(?:<|\()/;
-function isTanstackStartRouteModuleSource(source) {
-    return TANSTACK_START_ROUTE_FACTORY_REGEX.test(source);
-}
 function resolveTanstackRouteCodeSplittingEnabled(option) {
     if ('boolean' == typeof option) return option;
     return option?.enabled ?? true;
@@ -18,27 +9,7 @@ function createTanstackRsbuildRouteSplittingProfile(opts) {
             output: {
                 splitRouteChunks: resolveTanstackRouteCodeSplittingEnabled(opts.routeCodeSplitting)
             }
-        },
-        modernRouteChunks: {
-            enabled: resolveTanstackRouteCodeSplittingEnabled(opts.routeCodeSplitting),
-            owner: 'modern'
-        },
-        builderChunkSplit: {
-            owner: 'modern-rsbuild',
-            preserved: true
-        },
-        tanstackStartRspackSplitter: {
-            compatible: false,
-            reason: 'TanStack Start Rsbuild route splitting is tied to TanStack file-route factory modules; Modern generates TanStack route trees from Modern route metadata and owns route chunking through output.splitRouteChunks.',
-            clientDeleteNodes: [
-                'ssr',
-                'server',
-                'headers'
-            ],
-            routeFactoryCalls: [
-                ...TANSTACK_START_ROUTE_FACTORY_CALLS
-            ]
         }
     };
 }
-export { createTanstackRsbuildRouteSplittingProfile, isTanstackStartRouteModuleSource, resolveTanstackRouteCodeSplittingEnabled };
+export { createTanstackRsbuildRouteSplittingProfile, resolveTanstackRouteCodeSplittingEnabled };