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

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

@@ -1,17 +1,4 @@
-import type { Plugin, RuntimePluginExtends } from '@modern-js/plugin';
-import type { RuntimePluginAPI } from '@modern-js/plugin/runtime';
-import { type TInternalRuntimeContext } from '@modern-js/runtime/context';
-import { type RouterExtendsHooks } from './hooks';
+import { type TanstackRouterRuntimePlugin } from './pluginCore';
 import { type RouterConfig } from './types';
-type TanstackRouterRuntimeConfig = {
-    plugins?: TanstackRouterRuntimePlugin[];
-    router?: Partial<RouterConfig>;
-    [key: string]: unknown;
-};
-type TanstackRouterRuntimeExtends = Required<RuntimePluginExtends<TanstackRouterRuntimeConfig, TInternalRuntimeContext>> & {
-    extendHooks: RouterExtendsHooks;
-};
-type TanstackRouterPluginAPI = RuntimePluginAPI<TanstackRouterRuntimeExtends>;
-type TanstackRouterRuntimePlugin = Plugin<TanstackRouterPluginAPI, TInternalRuntimeContext>;
 export declare const tanstackRouterPlugin: (userConfig?: Partial<RouterConfig>) => TanstackRouterRuntimePlugin;
 export default tanstackRouterPlugin;

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

@@ -0,0 +1,21 @@
+import type { Plugin, RuntimePluginExtends } from '@modern-js/plugin';
+import type { RuntimePluginAPI } from '@modern-js/plugin/runtime';
+import { type TInternalRuntimeContext } from '@modern-js/runtime/context';
+import type { RouterExtendsHooks } from './hooks';
+import type { RouterConfig } from './types';
+export type TanstackRouterRuntimeConfig = {
+    plugins?: TanstackRouterRuntimePlugin[];
+    router?: Partial<RouterConfig>;
+    [key: string]: unknown;
+};
+type TanstackRouterRuntimeExtends = Required<RuntimePluginExtends<TanstackRouterRuntimeConfig, TInternalRuntimeContext>> & {
+    extendHooks: RouterExtendsHooks;
+};
+export type TanstackRouterPluginAPI = RuntimePluginAPI<TanstackRouterRuntimeExtends>;
+export type TanstackRouterRuntimePlugin = Plugin<TanstackRouterPluginAPI, TInternalRuntimeContext>;
+export declare function getMergedRouterConfig(api: TanstackRouterPluginAPI, userConfig: Partial<RouterConfig>): RouterConfig;
+export declare function getFinalRouteConfig(mergedConfig: RouterConfig): {
+    routes: (import("@modern-js/types").NestedRoute<string | (() => JSX.Element)> | import("@modern-js/types").PageRoute)[] | undefined;
+    globalApp: import("react").ComponentClass<{}, any> | import("react").FunctionComponent<{}> | undefined;
+};
+export {};

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

@@ -0,0 +1,9 @@
+import { Form, RouteActionResponseError, useFetcher } from './dataMutation';
+export declare const tanstackRouterCompatBindings: {
+    Form: typeof Form;
+    Link: <TRouter extends import("@tanstack/router-core").AnyRouter = import("@tanstack/router-core").AnyRouter, const TFrom extends string = string, const TTo extends string | undefined = undefined, const TMaskFrom extends string = TFrom, const TMaskTo extends string = "">(props: import("./prefetchLink").LinkProps<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>) => import("react").ReactElement;
+    NavLink: <TRouter extends import("@tanstack/router-core").AnyRouter = import("@tanstack/router-core").AnyRouter, const TFrom extends string = string, const TTo extends string | undefined = undefined, const TMaskFrom extends string = TFrom, const TMaskTo extends string = "">(props: import("./prefetchLink").LinkProps<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>) => import("react").ReactElement;
+    Outlet: import("react").MemoExoticComponent<() => import("react").JSX.Element>;
+    RouteActionResponseError: typeof RouteActionResponseError;
+    useFetcher: typeof useFetcher;
+};

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

@@ -1,11 +1,9 @@
 import type { RouteObject } from '@modern-js/runtime-utils/router';
-import type { NestedRoute, PageRoute } from '@modern-js/types';
 import type { AnyRouter, RootRoute as TanstackRootRoute } from '@tanstack/react-router';
 type ModernTanstackRootRoute = TanstackRootRoute;
 type RouteTreeOptions = {
     rscPayloadRouter?: boolean;
 };
-export declare function createRouteTreeFromModernRoutes(routes: Array<NestedRoute | PageRoute>, options?: RouteTreeOptions): ModernTanstackRootRoute;
 export declare function createRouteTreeFromRouteObjects(routes: RouteObject[], options?: RouteTreeOptions): ModernTanstackRootRoute;
 export declare function getModernRouteIdsFromMatches(router: AnyRouter): string[];
 export {};

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

@@ -0,0 +1,14 @@
+/**
+ * Entry-injected router module for entrypoints that are NOT TanStack
+ * file-route entrypoints (e.g. apps configuring
+ * `router: { framework: 'tanstack', createRoutes }` in modern.runtime.ts).
+ *
+ * The CLI plugin injects `{ name: 'router', path: '<pkg>/runtime/router' }`
+ * for those entries, so the generated entry code value-imports `routerPlugin`
+ * from here. That single import both installs the framework-resolving router
+ * plugin of @modern-js/runtime AND registers the TanStack router provider
+ * (the './register' side effect) — the registration can therefore never be
+ * tree-shaken away from the entry that needs it.
+ */
+import './register';
+export { routerPlugin } from '@modern-js/runtime/router/internal';

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

@@ -0,0 +1,16 @@
+import type { AnyRouter } from '@tanstack/react-router';
+import type { InternalRouterRuntimeState } from './types';
+/**
+ * Router runtime state as published by the TanStack router provider into the
+ * runtime-context extension slot.
+ */
+export interface TanstackRouterState extends Omit<InternalRouterRuntimeState, 'framework' | 'instance'> {
+    framework: 'tanstack';
+    instance?: AnyRouter;
+}
+/**
+ * Typed accessor for the TanStack router state stored on a Modern.js runtime
+ * context. Returns `undefined` when the active router provider is not
+ * TanStack (e.g. react-router) or no router has been created yet.
+ */
+export declare function getTanstackRouterState(context: object): TanstackRouterState | undefined;

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

@@ -1,23 +1,23 @@
-import type { RequestContext } from '@modern-js/runtime-utils/node';
+import type { RouterFramework } from '@modern-js/runtime/context';
 import type { RouteObject } from '@modern-js/runtime-utils/router';
 import type { NestedRoute, PageRoute } from '@modern-js/types';
 import type React from 'react';
-export type BuiltInRouterFramework = 'react-router' | 'tanstack';
-export type RouterFramework = BuiltInRouterFramework | (string & {});
+export type { BuiltInRouterFramework, InternalRouterRuntimeState, InternalRouterServerSnapshot, RouterFramework, RouterRouteMatchSnapshot, RouterServerPrepareResult, } from '@modern-js/runtime/context';
+/**
+ * TanStack-specific router config. Unlike the react-router provider config,
+ * this intentionally has no `oldVersion`/`future` fields — those are
+ * react-router-only knobs with no meaning here.
+ */
 export type RouterConfig = {
     framework?: RouterFramework;
     routesConfig: {
         globalApp?: React.ComponentType<any>;
         routes?: (NestedRoute | PageRoute)[];
     };
-    oldVersion?: boolean;
     serverBase?: string[];
     supportHtml5History?: boolean;
     basename?: string;
     createRoutes?: () => RouteObject[];
-    future?: Partial<{
-        v7_startTransition: boolean;
-    }>;
     defaultStructuralSharing?: boolean;
     unstable_reloadOnURLMismatch?: boolean;
 };
@@ -27,49 +27,3 @@ export declare const modernTanstackRouterFastDefaults: {
 export declare const getModernTanstackRouterFastDefaults: (config?: Partial<Pick<RouterConfig, 'defaultStructuralSharing'>>) => {
     defaultStructuralSharing: boolean;
 };
-export interface RouterRouteMatchSnapshot {
-    routeId: string;
-    assetRouteId?: string;
-    pathname?: string;
-    params?: Record<string, string>;
-}
-export interface InternalRouterServerSnapshot {
-    framework?: RouterFramework;
-    basename?: string;
-    statusCode?: number;
-    errors?: Record<string, unknown>;
-    routerData?: {
-        loaderData?: Record<string, unknown>;
-        errors?: Record<string, unknown>;
-    };
-    hydrationScript?: string;
-    hydrationScripts?: string[];
-    matchedRouteIds?: string[];
-    matches?: RouterRouteMatchSnapshot[];
-}
-export interface InternalRouterRuntimeState {
-    framework: RouterFramework;
-    basename?: string;
-    instance?: unknown;
-    hydrationScript?: string;
-    hydrationScripts?: string[];
-    matchedRouteIds?: string[];
-    matches?: RouterRouteMatchSnapshot[];
-    serverSnapshot?: InternalRouterServerSnapshot;
-    cleanup?: () => void | Promise<void>;
-}
-export interface RouterServerPrepareResult {
-    state: InternalRouterRuntimeState;
-    snapshot?: InternalRouterServerSnapshot;
-    redirect?: Response;
-    cleanup?: () => void | Promise<void>;
-}
-interface DataFunctionArgs<D = any> {
-    request: Request;
-    params: Record<string, string>;
-    context?: D;
-}
-export type LoaderFunctionArgs<P extends Record<string, unknown> = Record<string, unknown>> = DataFunctionArgs<RequestContext<P>>;
-type DataFunctionValue = Response | NonNullable<unknown> | null;
-export type LoaderFunction = <P extends Record<string, unknown> = Record<string, unknown>>(args: LoaderFunctionArgs<P>) => Promise<DataFunctionValue> | DataFunctionValue;
-export {};

package/package.json

@@ -18,7 +18,7 @@
     "modern.js",
     "tanstack-router"
   ],
-  "version": "3.2.0-ultramodern.99",
+  "version": "3.4.0-ultramodern.0",
   "engines": {
     "node": ">=20"
   },
@@ -49,17 +49,12 @@
       },
       "default": "./dist/esm/runtime/index.mjs"
     },
-    "./runtime/rsc": {
-      "types": "./dist/types/runtime/rsc/index.d.ts",
-      "default": "./dist/esm/runtime/rsc/index.mjs"
-    },
-    "./runtime/rsc/client": {
-      "types": "./dist/types/runtime/rsc/client.d.ts",
-      "default": "./dist/esm/runtime/rsc/client.mjs"
-    },
-    "./runtime/rsc/server": {
-      "types": "./dist/types/runtime/rsc/server.d.ts",
-      "default": "./dist/esm/runtime/rsc/server.mjs"
+    "./runtime/router": {
+      "types": "./dist/types/runtime/router.d.ts",
+      "node": {
+        "module": "./dist/esm/runtime/router.mjs"
+      },
+      "default": "./dist/esm/runtime/router.mjs"
     }
   },
   "typesVersions": {
@@ -73,47 +68,54 @@
       "runtime": [
         "./dist/types/runtime/index.d.ts"
       ],
-      "runtime/rsc": [
-        "./dist/types/runtime/rsc/index.d.ts"
-      ],
-      "runtime/rsc/client": [
-        "./dist/types/runtime/rsc/client.d.ts"
-      ],
-      "runtime/rsc/server": [
-        "./dist/types/runtime/rsc/server.d.ts"
+      "runtime/router": [
+        "./dist/types/runtime/router.d.ts"
       ]
     }
   },
   "dependencies": {
     "@swc/helpers": "^0.5.23",
-    "@tanstack/react-router": "1.170.11",
-    "@tanstack/router-core": "1.171.9",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.2.0-ultramodern.99",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.2.0-ultramodern.99",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.99",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.99"
+    "@tanstack/react-router": "1.170.16",
+    "@tanstack/router-core": "1.171.13",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.4.0-ultramodern.0",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.4.0-ultramodern.0",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.4.0-ultramodern.0",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.4.0-ultramodern.0"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "3.2.0-ultramodern.99",
-    "react": "^19.2.6",
-    "react-dom": "^19.2.6"
+    "@modern-js/runtime": "3.4.0-ultramodern.0",
+    "react": "^19.2.7",
+    "react-dom": "^19.2.7"
   },
   "devDependencies": {
-    "@rslib/core": "0.21.5",
+    "@rslib/core": "0.23.0",
     "@tanstack/history": "1.162.0",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
-    "@types/node": "^25.9.1",
-    "@types/react": "^19.2.15",
+    "@types/node": "^26.0.0",
+    "@types/react": "^19.2.17",
     "@types/react-dom": "^19.2.3",
-    "@typescript/native-preview": "7.0.0-dev.20260527.2",
-    "react": "^19.2.6",
-    "react-dom": "^19.2.6",
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.2.0-ultramodern.99",
+    "@typescript/native-preview": "7.0.0-dev.20260624.1",
+    "react": "^19.2.7",
+    "react-dom": "^19.2.7",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.4.0-ultramodern.0",
     "@scripts/rstest-config": "2.66.0",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.2.0-ultramodern.99"
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.4.0-ultramodern.0"
   },
-  "sideEffects": false,
+  "sideEffects": [
+    "./src/runtime/register.ts",
+    "./src/runtime/index.tsx",
+    "./src/runtime/router.ts",
+    "./dist/esm/runtime/register.mjs",
+    "./dist/esm/runtime/index.mjs",
+    "./dist/esm/runtime/router.mjs",
+    "./dist/esm-node/runtime/register.mjs",
+    "./dist/esm-node/runtime/index.mjs",
+    "./dist/esm-node/runtime/router.mjs",
+    "./dist/cjs/runtime/register.js",
+    "./dist/cjs/runtime/index.js",
+    "./dist/cjs/runtime/router.js"
+  ],
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"

package/rstest.config.mts

@@ -24,6 +24,11 @@ export default {
       testEnvironment: 'node',
       include: [
         'tests/router/cli.test.ts',
+        'tests/router/fastDefaults.test.ts',
+        'tests/router/hooks.test.ts',
+        'tests/router/loaderBridge.test.ts',
+        'tests/router/packageSurface.test.ts',
+        'tests/router/register.test.ts',
         'tests/router/rsc.test.tsx',
         'tests/router/tanstackTypes.test.ts',
         'tests/router/routeTree.test.ts',
@@ -35,6 +40,7 @@ export default {
       testEnvironment: 'happy-dom',
       include: [
         'tests/router/dataMutation.test.tsx',
+        'tests/router/hydrationBoundary.test.tsx',
         'tests/router/prefetchLink.test.tsx',
       ],
       extends: commonConfig,

package/src/cli/index.ts

@@ -23,8 +23,8 @@ import {
   type TanstackRouteCodeSplittingOption,
 } from './routeSplitting';
 import {
+  collectCanonicalRoutesForEntry,
   generateTanstackRouterTypesSourceForEntry,
-  isTanstackRouterFrameworkEnabled,
 } from './tanstackTypes';
 
 export type {
@@ -33,12 +33,12 @@ export type {
 } from './routeSplitting';
 export {
   createTanstackRsbuildRouteSplittingProfile,
-  isTanstackStartRouteModuleSource,
   resolveTanstackRouteCodeSplittingEnabled,
 } from './routeSplitting';
 export {
+  type CollectCanonicalRoutesOptions,
+  collectCanonicalRoutesForEntry,
   generateTanstackRouterTypesSourceForEntry,
-  isTanstackRouterFrameworkEnabled,
 } from './tanstackTypes';
 
 const DEFAULT_ROUTES_DIR = 'routes';
@@ -53,6 +53,7 @@ export type TanstackRouterPluginOptions = {
 
 type RuntimeRouterCliHelpers = {
   getEntrypointRoutesDir: (entrypoint: Entrypoint) => string | null;
+  getEntrypointRoutesOwner: (entrypoint: Entrypoint) => string | null;
   handleFileChange: (
     api: CLIPluginAPI<AppTools>,
     event: unknown,
@@ -72,9 +73,6 @@ type RuntimeRouterCliHelpers = {
     entrypoints: Entrypoint[],
     options?: {
       entrypointsKey?: string;
-      generateCodeOptions?: {
-        enableTanstackTypes?: boolean;
-      };
     },
   ) => Promise<Record<string, (NestedRouteForCli | PageRoute)[]>>;
   handleModifyEntrypoints: (
@@ -96,7 +94,11 @@ function getRuntimeRouterCli(): RuntimeRouterCliHelpers {
 
   const cli =
     require('@modern-js/runtime/cli') as Partial<RuntimeRouterCliHelpers>;
-  if (cli.handleGeneratorEntryCode && cli.getEntrypointRoutesDir) {
+  if (
+    cli.handleGeneratorEntryCode &&
+    cli.getEntrypointRoutesDir &&
+    cli.getEntrypointRoutesOwner
+  ) {
     runtimeRouterCli = cli as RuntimeRouterCliHelpers;
     return runtimeRouterCli;
   }
@@ -124,6 +126,8 @@ async function writeFileIfChanged(filePath: string, content: string) {
 function createRegisterDtsContent(opts: {
   entries: string[];
   runtimeModule: string;
+  canonicalRoutes?: Record<string, string> | null;
+  i18nRuntimeModule?: string;
 }) {
   const importStatements = opts.entries
     .map(
@@ -135,6 +139,20 @@ function createRegisterDtsContent(opts: {
     .map((_, index) => `typeof router${index}`)
     .join(' | ');
 
+  const canonicalEntries = Object.entries(opts.canonicalRoutes ?? {});
+  const canonicalRoutesAugmentation =
+    canonicalEntries.length > 0
+      ? `
+declare module '${opts.i18nRuntimeModule || '@modern-js/plugin-i18n/runtime'}' {
+  interface UltramodernCanonicalRoutes {
+${canonicalEntries
+  .map(([routePath, paramsType]) => `    '${routePath}': ${paramsType};`)
+  .join('\n')}
+  }
+}
+`
+      : '';
+
   return `// This file is auto-generated by Modern.js. Do not edit manually.
 
 ${importStatements}
@@ -144,7 +162,7 @@ declare module '${opts.runtimeModule}' {
     router: ${routerUnionType};
   }
 }
-`;
+${canonicalRoutesAugmentation}`;
 }
 
 export async function writeTanstackRegisterFile(opts: {
@@ -152,12 +170,16 @@ export async function writeTanstackRegisterFile(opts: {
   generatedDirName?: string;
   runtimeModule?: string;
   srcDirectory: string;
+  canonicalRoutes?: Record<string, string> | null;
+  i18nRuntimeModule?: string;
 }) {
   const {
     entries,
     generatedDirName = DEFAULT_GENERATED_DIR_NAME,
     runtimeModule = '@modern-js/plugin-tanstack/runtime',
     srcDirectory,
+    canonicalRoutes,
+    i18nRuntimeModule,
   } = opts;
 
   if (entries.length === 0) {
@@ -172,7 +194,12 @@ export async function writeTanstackRegisterFile(opts: {
 
   await writeFileIfChanged(
     registerDtsPath,
-    createRegisterDtsContent({ entries, runtimeModule }),
+    createRegisterDtsContent({
+      entries,
+      runtimeModule,
+      canonicalRoutes,
+      i18nRuntimeModule,
+    }),
   );
 }
 
@@ -180,11 +207,19 @@ export async function writeTanstackRouterTypesForEntries(opts: {
   appContext: AppToolsContext;
   generatedDirName?: string;
   routesByEntry: Record<string, (NestedRouteForCli | PageRoute)[]>;
+  /**
+   * Whether `@modern-js/plugin-i18n` is actually installed in the app. The
+   * `register.gen.d.ts` augmentation of '@modern-js/plugin-i18n/runtime' is
+   * only emitted when this is true — otherwise apps with a hand-rolled
+   * `/:lang/` param would fail typechecking on an unresolvable module.
+   */
+  i18nPluginInstalled?: boolean;
 }) {
   const {
     appContext,
     generatedDirName = DEFAULT_GENERATED_DIR_NAME,
     routesByEntry,
+    i18nPluginInstalled = false,
   } = opts;
 
   const entryNames = Object.keys(routesByEntry);
@@ -225,10 +260,31 @@ export async function writeTanstackRouterTypesForEntries(opts: {
     return a.localeCompare(b);
   });
 
+  // Merge the canonical (language-agnostic) route maps of every entry so the
+  // typed i18n Link covers all routes the app can navigate to. Only relevant
+  // when plugin-i18n is actually installed — without it the emitted module
+  // augmentation would reference an unresolvable module.
+  let canonicalRoutes: Record<string, string> | null = 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,
+    canonicalRoutes,
   });
 }
 
@@ -252,11 +308,38 @@ export function tanstackRouterPlugin(
         return getEntrypointRoutesDir(entrypoint) === routesDir;
       };
 
-      api._internalRuntimePlugins(({ entrypoint, plugins }) => {
-        if (!isTanstackEntrypoint(entrypoint as Entrypoint)) {
-          return { entrypoint, plugins };
+      // Entrypoints claimed by another file-route convention — the built-in
+      // pages/ or routes/ entries of @modern-js/runtime's router plugin, or
+      // an entry tagged by a different routes-owner plugin. Their router
+      // runtime plugin must be left untouched: redirecting it through our
+      // wrapper would value-import the TanStack runtime into bundles that
+      // never use it, and pushing a second `router` plugin can install two
+      // routers for one entry.
+      const isForeignRouteEntrypoint = (entrypoint: Entrypoint) => {
+        const { getEntrypointRoutesDir, getEntrypointRoutesOwner } =
+          getRuntimeRouterCli();
+        if (getEntrypointRoutesOwner(entrypoint)) {
+          // Owned by some routes-owner plugin. TanStack-owned entries were
+          // already claimed by the isTanstackEntrypoint branch, so any owner
+          // seen here is foreign.
+          return true;
         }
+        if (entrypoint.pageRoutesEntry) {
+          return true;
+        }
+        return getEntrypointRoutesDir(entrypoint) !== null;
+      };
 
+      const isI18nPluginInstalled = () => {
+        const { plugins } = api.getAppContext() as {
+          plugins?: Array<{ name?: string }>;
+        };
+        return Boolean(
+          plugins?.some(plugin => plugin?.name === '@modern-js/plugin-i18n'),
+        );
+      };
+
+      api._internalRuntimePlugins(({ entrypoint, plugins }) => {
         const { metaName, serverRoutes } = api.getAppContext();
         const serverBase = serverRoutes
           .filter(
@@ -265,11 +348,44 @@ export function tanstackRouterPlugin(
           .map(route => route.urlPath)
           .sort((a, b) => (a.length - b.length > 0 ? -1 : 1));
 
-        plugins.push({
-          name: 'tanstackRouter',
-          path: `@${metaName}/plugin-tanstack/runtime`,
-          config: { serverBase },
-        });
+        if (isTanstackEntrypoint(entrypoint as Entrypoint)) {
+          plugins.push({
+            name: 'tanstackRouter',
+            path: `@${metaName}/plugin-tanstack/runtime`,
+            config: { serverBase },
+          });
+
+          return { entrypoint, plugins };
+        }
+
+        // Entries owned by the built-in router (classic routes/ or pages/
+        // conventions) or by another routes-owner plugin keep their own
+        // router runtime plugin untouched.
+        if (isForeignRouteEntrypoint(entrypoint as Entrypoint)) {
+          return { entrypoint, plugins };
+        }
+
+        // True custom entry without any file-route convention (`createRoutes`
+        // apps, hand-rolled App entries, ...): having this plugin installed
+        // is the explicit signal that the app routes through the
+        // router-provider registry — no source sniffing of modern.runtime.ts.
+        // Inject the framework-resolving router plugin of @modern-js/runtime
+        // through our own runtime/router module, so the TanStack provider
+        // registration is value-imported together with it and can never be
+        // tree-shaken away from the entry.
+        const routerWrapperPath = `@${metaName}/plugin-tanstack/runtime/router`;
+        const existingRouterPlugin = plugins.find(
+          plugin => plugin.name === 'router',
+        );
+        if (existingRouterPlugin) {
+          existingRouterPlugin.path = routerWrapperPath;
+        } else {
+          plugins.push({
+            name: 'router',
+            path: routerWrapperPath,
+            config: { serverBase },
+          });
+        }
 
         return { entrypoint, plugins };
       });
@@ -284,8 +400,18 @@ export function tanstackRouterPlugin(
         ...routeSplittingProfile.defaultConfig,
         source: {
           include: [
+            // TanStack Router and its runtime deps ship modern syntax and
+            // must be down-leveled for the app's browser targets.
             /[\\/]node_modules[\\/]@tanstack[\\/]react-router[\\/]/,
-            path.resolve(__dirname, '../runtime').replace('cjs', 'esm'),
+            /[\\/]node_modules[\\/]@tanstack[\\/]router-core[\\/]/,
+            /[\\/]node_modules[\\/]@tanstack[\\/]react-store[\\/]/,
+            // This package's own dist runtime, too. `__dirname` is
+            // dist/{cjs,esm-node}/cli (or src/cli in tests), so the package
+            // dist root is two levels up. Resolution-based — no string
+            // surgery: the old `.replace('cjs', 'esm')` corrupted workspace
+            // paths containing 'cjs' and, under the ESM CLI condition, never
+            // matched the dist/esm runtime that browsers actually bundle.
+            path.resolve(__dirname, '..', '..'),
           ],
         },
       }));
@@ -312,9 +438,6 @@ export function tanstackRouterPlugin(
           tanstackEntrypoints,
           {
             entrypointsKey: ENTRYPOINTS_KEY,
-            generateCodeOptions: {
-              enableTanstackTypes: false,
-            },
           },
         );
 
@@ -322,6 +445,7 @@ export function tanstackRouterPlugin(
           appContext: api.getAppContext(),
           generatedDirName,
           routesByEntry,
+          i18nPluginInstalled: isI18nPluginInstalled(),
         });
       });
 
@@ -340,9 +464,6 @@ export function tanstackRouterPlugin(
               entrypoints,
               {
                 entrypointsKey: ENTRYPOINTS_KEY,
-                generateCodeOptions: {
-                  enableTanstackTypes: false,
-                },
               },
             );
 
@@ -350,6 +471,7 @@ export function tanstackRouterPlugin(
               appContext: api.getAppContext(),
               generatedDirName,
               routesByEntry,
+              i18nPluginInstalled: isI18nPluginInstalled(),
             });
           },
         });