@bleedingdev/modern-js-plugin-tanstack 3.8.3-ultramodern.6 → 3.9.0-ultramodern.10

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,6 +1,4 @@
 import "node:module";
-import { registerRouterProvider } from "@modern-js/runtime/context";
 import { tanstackRouterPlugin } from "./plugin.mjs";
 const tanstackRouterProviderFactory = (userConfig)=>tanstackRouterPlugin(userConfig);
-registerRouterProvider('tanstack', tanstackRouterProviderFactory);
 export { tanstackRouterProviderFactory };

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

@@ -1,17 +1,33 @@
 import "node:module";
-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-node/runtime/state.mjs

@@ -1,5 +1,5 @@
 import "node:module";
-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-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/cli/index.d.ts

@@ -1,9 +1,9 @@
 import type { AppTools, CliPlugin } from '@modern-js/app-tools';
-import { type TanstackRouteCodeSplittingOption } from './routeSplitting';
-export { generateTanstackRouteArtifacts, writeTanstackRegisterFile, writeTanstackRouterTypesForEntries, } from './artifacts';
-export type { TanstackRouteCodeSplittingOption, TanstackRsbuildRouteSplittingProfile, } from './routeSplitting';
-export { createTanstackRsbuildRouteSplittingProfile, resolveTanstackRouteCodeSplittingEnabled, } from './routeSplitting';
-export { type CollectCanonicalRoutesOptions, collectCanonicalRoutesForEntry, generateTanstackRouterTypesSourceForEntry, } from './tanstackTypes';
+import { type TanstackRouteCodeSplittingOption } from './routeSplitting.js';
+export { generateTanstackRouteArtifacts, writeTanstackRegisterFile, writeTanstackRouterTypesForEntries, } from './artifacts.js';
+export type { TanstackRouteCodeSplittingOption, TanstackRsbuildRouteSplittingProfile, } from './routeSplitting.js';
+export { createTanstackRsbuildRouteSplittingProfile, resolveTanstackRouteCodeSplittingEnabled, } from './routeSplitting.js';
+export { type CollectCanonicalRoutesOptions, collectCanonicalRoutesForEntry, generateTanstackRouterTypesSourceForEntry, } from './tanstackTypes.js';
 export type TanstackRouterPluginOptions = {
     routesDir?: string;
     generatedDirName?: string;

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

@@ -1,5 +1,5 @@
 import type { NestedRouteForCli, PageRoute } from '@modern-js/types';
-export { toTanstackPath } from '../../runtime/routeTree/paths';
+export { toTanstackPath } from '../../runtime/routeTree/paths.js';
 export declare function resolveFileNoExt(inputNoExtPath: string): Promise<string | null>;
 export declare function quote(str: string): string;
 export declare function normalizeRelativeImport(p: string): string;

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

@@ -1,3 +1,3 @@
-export type { CollectCanonicalRoutesOptions } from './tanstackTypes/canonicalRoutes';
-export { collectCanonicalRoutesForEntry } from './tanstackTypes/canonicalRoutes';
-export { generateTanstackRouterTypesSourceForEntry } from './tanstackTypes/source';
+export type { CollectCanonicalRoutesOptions } from './tanstackTypes/canonicalRoutes.js';
+export { collectCanonicalRoutesForEntry } from './tanstackTypes/canonicalRoutes.js';
+export { generateTanstackRouterTypesSourceForEntry } from './tanstackTypes/source.js';

package/dist/types/cli.d.ts

@@ -1,2 +1,2 @@
-export * from './cli/index';
-export { default } from './cli/index';
+export * from './cli/index.js';
+export { default } from './cli/index.js';

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/dist/types/runtime/dataMutation.d.ts

@@ -1,7 +1,7 @@
 import type React from 'react';
-import type { SubmitOptions, SubmitTarget } from './formData';
-export type { SubmitOptions } from './formData';
-export { RouteActionResponseError } from './submitAction';
+import type { SubmitOptions, SubmitTarget } from './formData.js';
+export type { SubmitOptions } from './formData.js';
+export { RouteActionResponseError } from './submitAction.js';
 export type FetcherState = 'idle' | 'submitting' | 'loading';
 export type FormProps = Omit<React.FormHTMLAttributes<HTMLFormElement>, 'onSubmit' | 'action'> & {
     action?: string;

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

@@ -1,15 +1,15 @@
-import './register';
+import './register.js';
 export * from '@tanstack/react-router';
-export type { Fetcher, FetcherState, FetcherSubmitOptions, FormProps, SubmitOptions, } from './dataMutation';
-export { Form, RouteActionResponseError, useFetcher, } from './dataMutation';
-export type { ModernRouterContext } from './loaderBridge';
-export { createRouteStaticData, isAbsoluteUrl, modernLoaderToTanstack, throwTanstackRedirect, } from './loaderBridge';
-export { Outlet } from './outlet';
-export { tanstackRouterPlugin, tanstackRouterPlugin as default, } from './plugin';
-export type { LinkProps, NavLinkProps, PrefetchBehavior, } from './prefetchLink';
-export { Link, NavLink } from './prefetchLink';
-export { useChildMatches, useMatch, useMatches, useParentMatches, useRouterState, } from './routeHooks';
-export type { TanstackRouterState } from './state';
-export { getTanstackRouterState } from './state';
-export type { RouterConfig } from './types';
-export { getModernTanstackRouterFastDefaults, modernTanstackRouterFastDefaults, } from './types';
+export type { Fetcher, FetcherState, FetcherSubmitOptions, FormProps, SubmitOptions, } from './dataMutation.js';
+export { Form, RouteActionResponseError, useFetcher, } from './dataMutation.js';
+export type { ModernRouterContext } from './loaderBridge.js';
+export { createRouteStaticData, isAbsoluteUrl, modernLoaderToTanstack, throwTanstackRedirect, } from './loaderBridge.js';
+export { Outlet } from './outlet.js';
+export { tanstackRouterPlugin, tanstackRouterPlugin as default, } from './plugin.js';
+export type { LinkProps, NavLinkProps, PrefetchBehavior, } from './prefetchLink.js';
+export { Link, NavLink } from './prefetchLink.js';
+export { useChildMatches, useMatch, useMatches, useParentMatches, useRouterState, } from './routeHooks.js';
+export type { TanstackRouterState } from './state.js';
+export { getTanstackRouterState } from './state.js';
+export type { RouterConfig } from './types.js';
+export { getModernTanstackRouterFastDefaults, modernTanstackRouterFastDefaults, } from './types.js';

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

@@ -1,7 +1,14 @@
 /**
- * The router runtime state helpers are owned by @modern-js/runtime (the same
+ * The router runtime state helpers are owned by @modern-js/runtime-extensions (the same
  * implementation backs the built-in react-router provider and the SSR
  * pipeline). This module only re-exports them so every router provider
  * writes to the exact same runtime-context extension slot.
  */
-export { applyRouterRuntimeState, applyRouterServerPrepareResult, createRouterRuntimeState, createRouterServerSnapshot, getRouterRuntimeState, getRouterServerSnapshot, type RouterLifecycleContext, type RouterLifecyclePhase, } from '@modern-js/runtime/context';
+import type { RouterLifecycleContext as NativeRouterLifecycleContext } from '@modern-js/runtime/context';
+import type { InternalRouterServerSnapshot, RouterRouteMatchSnapshot } from '@modern-js/runtime-extensions/router-state';
+export type RouterLifecycleContext = NativeRouterLifecycleContext & {
+    matches?: RouterRouteMatchSnapshot[];
+    cleanup?: () => void | Promise<void>;
+    serverSnapshot?: InternalRouterServerSnapshot;
+};
+export { applyRouterRuntimeState, applyRouterServerPrepareResult, createRouterRuntimeState, createRouterServerSnapshot, getRouterRuntimeState, getRouterServerSnapshot, type RouterLifecyclePhase, } from '@modern-js/runtime-extensions/router-state';

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

@@ -1,5 +1,5 @@
-import { createRouteStaticData } from '../shared/routeStaticData';
-import { isAbsoluteUrl } from './shared/isAbsoluteUrl';
+import { createRouteStaticData } from '../shared/routeStaticData.js';
+import { isAbsoluteUrl } from './shared/isAbsoluteUrl.js';
 export { createRouteStaticData, isAbsoluteUrl };
 /** Router context shape used by the generated TanStack router types. */
 export type ModernRouterContext = {

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

@@ -1,4 +1,4 @@
-import { type TanstackRouterRuntimePlugin } from './pluginShared';
-import { type RouterConfig } from './types';
+import { type TanstackRouterRuntimePlugin } from './pluginShared.js';
+import { type RouterConfig } from './types.js';
 export declare const tanstackRouterPlugin: (userConfig?: Partial<RouterConfig>) => TanstackRouterRuntimePlugin;
 export default tanstackRouterPlugin;

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

@@ -1,4 +1,4 @@
-import { type TanstackRouterRuntimePlugin } from './pluginShared';
-import { type RouterConfig } from './types';
+import { type TanstackRouterRuntimePlugin } from './pluginShared.js';
+import { type RouterConfig } from './types.js';
 export declare const tanstackRouterPlugin: (userConfig?: Partial<RouterConfig>) => TanstackRouterRuntimePlugin;
 export default tanstackRouterPlugin;

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

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

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

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

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

@@ -1,10 +1,2 @@
-/**
- * Registers TanStack in the @modern-js/runtime compatibility registry.
- * Runtime entries bind the exported local factory into their own provider
- * realm; registration remains for older runtime wrappers and mixed cohorts.
- *
- * This module is intentionally side-effectful (see `sideEffects` in
- * package.json).
- */
-import { type RouterProviderFactory } from '@modern-js/runtime/context';
+import { type RouterProviderFactory } from '@modern-js/runtime-extensions/router-provider';
 export declare const tanstackRouterProviderFactory: RouterProviderFactory;

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

@@ -1,5 +1,5 @@
 import type { RouteObject } from '@modern-js/runtime-utils/router';
 import type { AnyRouter } from '@tanstack/react-router';
-import type { ModernTanstackRootRoute, RouteTreeOptions } from './types';
+import type { ModernTanstackRootRoute, RouteTreeOptions } from './types.js';
 export declare function createRouteTreeFromRouteObjects(routes: RouteObject[], options?: RouteTreeOptions): ModernTanstackRootRoute;
 export declare function getModernRouteIdsFromMatches(router: AnyRouter): string[];

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

@@ -1,2 +1,2 @@
-export { pickRouteModuleComponent } from './components';
-export { createRouteTreeFromRouteObjects, getModernRouteIdsFromMatches, } from './construction';
+export { pickRouteModuleComponent } from './components.js';
+export { createRouteTreeFromRouteObjects, getModernRouteIdsFromMatches, } from './construction.js';

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

@@ -1,4 +1,4 @@
 import type { RouteObject } from '@modern-js/runtime-utils/router';
-import type { RouteRevalidationState, RouteTreeOptions, TanstackLoaderContext } from './types';
+import type { RouteRevalidationState, RouteTreeOptions, TanstackLoaderContext } from './types.js';
 export declare function createModernShouldReload(shouldRevalidate: unknown, state: RouteRevalidationState): ((ctx: TanstackLoaderContext) => boolean | undefined) | undefined;
 export declare function wrapRouteObjectLoader(route: RouteObject, revalidationState?: RouteRevalidationState, options?: RouteTreeOptions): ((ctx: TanstackLoaderContext) => Promise<unknown>) | undefined;

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

@@ -1,4 +1,4 @@
-import type { MutableTanstackRoute, TanstackRootRouteOptions, TanstackRouteOptions } from './types';
+import type { MutableTanstackRoute, TanstackRootRouteOptions, TanstackRouteOptions } from './types.js';
 export declare function createTanstackRoute(options: TanstackRouteOptions): MutableTanstackRoute;
 export declare function createTanstackRootRoute(options: TanstackRootRouteOptions): MutableTanstackRoute;
 export declare function wrapRouteComponentWithModernContext(route: MutableTanstackRoute, component: unknown, routeId?: string): void;

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

@@ -1,13 +1,2 @@
-/**
- * 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. This module creates a framework-resolving wrapper whose
- * app-owned provider realm contains this module graph's TanStack factory.
- */
-import * as runtimeRouter from '@modern-js/runtime/router/internal';
-type LegacyRouterPlugin = (typeof runtimeRouter)['routerPlugin'];
-export declare const routerPlugin: LegacyRouterPlugin;
-export {};
+import { routerPlugin as nativeRouterPlugin } from '@modern-js/runtime/router/internal';
+export declare const routerPlugin: typeof nativeRouterPlugin;

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

@@ -1,2 +1,2 @@
-import { type AnyCompositeComponent, type CompositeComponentProps } from './symbols';
+import { type AnyCompositeComponent, type CompositeComponentProps } from './symbols.js';
 export declare function CompositeComponent<TComp extends AnyCompositeComponent>(props: CompositeComponentProps<TComp>): import("react").JSX.Element;

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

@@ -1,4 +1,4 @@
-import type { AnyRenderableServerComponent } from './symbols';
+import type { AnyRenderableServerComponent } from './symbols.js';
 export declare function RscNodeRenderer({ data, }: {
     data: AnyRenderableServerComponent;
 }): import("react").JSX.Element;

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

@@ -1,7 +1,7 @@
-import { CompositeComponent } from './CompositeComponent';
-import type { SerializedTanstackRscFlightValue } from './shared';
-import type { AnyCompositeComponent, RscSlotUsageEvent } from './symbols';
-export type { AnyCompositeComponent, AnyRenderableServerComponent, CompositeComponentProps, } from './symbols';
+import { CompositeComponent } from './CompositeComponent.js';
+import type { SerializedTanstackRscFlightValue } from './shared.js';
+import type { AnyCompositeComponent, RscSlotUsageEvent } from './symbols.js';
+export type { AnyCompositeComponent, AnyRenderableServerComponent, CompositeComponentProps, } from './symbols.js';
 export { CompositeComponent };
 type SerializedRsc = {
     kind: 'renderable' | 'composite';

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

@@ -1,4 +1,4 @@
-import { type RscSlotUsageEvent, type ServerComponentStream } from './symbols';
+import { type RscSlotUsageEvent, type ServerComponentStream } from './symbols.js';
 export declare function createRscProxy(getTree: () => unknown, options?: {
     renderable?: boolean;
     slotUsages?: RscSlotUsageEvent[];

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

@@ -1,5 +1,5 @@
 import type { ServerPayload } from '@modern-js/runtime/context';
-import { isAbsoluteUrl } from '../shared/isAbsoluteUrl';
+import { isAbsoluteUrl } from '../shared/isAbsoluteUrl.js';
 export { isAbsoluteUrl };
 type PayloadDecoder = (stream: ReadableStream<Uint8Array>) => Promise<unknown>;
 export declare const payloadFetchCache: Map<string, Promise<ServerPayload>>;

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

@@ -1,6 +1,6 @@
 import type { ServerPayload } from '@modern-js/runtime/context';
-import type { TanstackPayloadRouterLike } from './payloadRoutes';
-export { __setTanstackRscPayloadDecoderForTests } from './payloadFetch';
+import type { TanstackPayloadRouterLike } from './payloadRoutes.js';
+export { __setTanstackRscPayloadDecoderForTests } from './payloadFetch.js';
 type LoadRouteDataOptions = {
     hasClientLoader?: boolean;
     loadClientData: () => Promise<unknown>;

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

@@ -1,5 +1,5 @@
 import type { ServerPayload } from '@modern-js/runtime/context';
-import type { TanstackRouterWithServerSsr } from '../ssrTypes';
+import type { TanstackRouterWithServerSsr } from '../ssrTypes.js';
 export declare const setTanstackRscServerPayload: (payload: ServerPayload) => void;
 export declare const setTanstackRscRouter: (router: TanstackRouterWithServerSsr) => void;
 export declare const getTanstackRscRouter: () => TanstackRouterWithServerSsr | undefined;

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

@@ -1,8 +1,8 @@
 import { RawStream } from '@tanstack/router-core';
 import React from 'react';
-import { type AnyCompositeComponent, type AnyRenderableServerComponent, type RscSlotUsageEvent } from './symbols';
-export { CompositeComponent } from './CompositeComponent';
-export type { AnyCompositeComponent, AnyRenderableServerComponent, CompositeComponentProps, } from './symbols';
+import { type AnyCompositeComponent, type AnyRenderableServerComponent, type RscSlotUsageEvent } from './symbols.js';
+export { CompositeComponent } from './CompositeComponent.js';
+export type { AnyCompositeComponent, AnyRenderableServerComponent, CompositeComponentProps, } from './symbols.js';
 export declare function renderServerComponent<TNode extends React.ReactNode>(node: TNode): Promise<TNode & AnyRenderableServerComponent<TNode>>;
 export declare function createCompositeComponent<TProps extends object = Record<string, unknown>, TReturn = React.ReactNode>(component: (props: TProps) => React.ReactNode | Promise<React.ReactNode>): Promise<AnyCompositeComponent<TProps, TReturn>>;
 type SerializedRsc = {

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

@@ -1,5 +1,5 @@
 import type React from 'react';
-import { type AnyCompositeComponent, type AnyRenderableServerComponent, type RscSlotUsageEvent } from './symbols';
+import { type AnyCompositeComponent, type AnyRenderableServerComponent, type RscSlotUsageEvent } from './symbols.js';
 export declare const TANSTACK_RSC_FLIGHT_VALUE = "__modernTanstackRsc";
 export type SerializedTanstackRscFlightValue = {
     [TANSTACK_RSC_FLIGHT_VALUE]: true;

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

@@ -1,2 +1,2 @@
-import type { SerializableSlotArg } from './symbols';
+import type { SerializableSlotArg } from './symbols.js';
 export declare function sanitizeSlotArgs(args: unknown[]): SerializableSlotArg[];

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

@@ -1,5 +1,5 @@
 import type { AnyRouter } from '@tanstack/react-router';
-import type { TanstackRouterWithServerSsr } from './ssrTypes';
+import type { TanstackRouterWithServerSsr } from './ssrTypes.js';
 export declare function waitForRouterSerialization(tanstackRouter: TanstackRouterWithServerSsr): Promise<void>;
 export declare function routerManagedTagsToHtml(tags: unknown): string[];
 export declare function createGetSsrHref(request: Request): string;

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

@@ -1,2 +1,2 @@
-import type { TanstackRouterWithServerSsr } from './ssrTypes';
+import type { TanstackRouterWithServerSsr } from './ssrTypes.js';
 export declare function preloadMatchedRouteComponents(tanstackRouter: TanstackRouterWithServerSsr): Promise<void>;

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

@@ -1,4 +1,4 @@
-import { type InternalRouterRuntimeState } from '@modern-js/runtime/context';
+import { type InternalRouterRuntimeState } from '@modern-js/runtime-extensions/router-state';
 import type { AnyRouter } from '@tanstack/react-router';
 /**
  * Router runtime state as published by the TanStack router provider into the

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

@@ -1,5 +1,5 @@
 import type { AnyRouter } from '@tanstack/react-router';
-import type { SubmitOptions, SubmitTarget } from './formData';
+import type { SubmitOptions, SubmitTarget } from './formData.js';
 export declare class RouteActionResponseError<TData = unknown> extends Error {
     readonly response: Response;
     readonly data: TData;

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

@@ -1,7 +1,8 @@
 import type { ModernRoute } from '@modern-js/runtime/context';
 import type { RouteObject } from '@modern-js/runtime-utils/router';
 import type React from 'react';
-export type { InternalRouterServerSnapshot, ModernRoute, RouterFramework, } from '@modern-js/runtime/context';
+export type { ModernRoute } from '@modern-js/runtime/context';
+export type { InternalRouterServerSnapshot, RouterFramework, } from '@modern-js/runtime-extensions/router-state';
 /** TanStack-specific router config. */
 export type RouterConfig = {
     routesConfig: {

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

@@ -1,6 +1,6 @@
 import type { RouteObject } from '@modern-js/runtime-utils/router';
 import React from 'react';
-import type { ModernRoute } from './types';
+import type { ModernRoute } from './types.js';
 type RouterConfig = {
     routesConfig: {
         globalApp?: React.ComponentType<any>;

package/dist/types/runtime.d.ts

@@ -1 +1 @@
-export * from './runtime/index';
+export * from './runtime/index.js';

package/package.json

@@ -18,7 +18,7 @@
     "modern.js",
     "tanstack-router"
   ],
-  "version": "3.8.3-ultramodern.6",
+  "version": "3.9.0-ultramodern.10",
   "engines": {
     "node": ">=20"
   },
@@ -94,17 +94,19 @@
     }
   },
   "dependencies": {
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.8.3-ultramodern.6",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.8.3-ultramodern.6",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.8.3-ultramodern.6",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.8.3-ultramodern.6",
+    "@modern-js/i18n-runtime-extensions": "npm:@bleedingdev/modern-js-i18n-runtime-extensions@3.9.0-ultramodern.10",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.10",
+    "@modern-js/runtime-extensions": "npm:@bleedingdev/modern-js-runtime-extensions@3.9.0-ultramodern.10",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.10",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.10",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.10",
     "@swc/helpers": "^0.5.23",
-    "@tanstack/react-router": "1.170.32",
-    "@tanstack/router-core": "1.171.27"
+    "@tanstack/react-router": "1.170.33",
+    "@tanstack/router-core": "1.171.28"
   },
   "peerDependencies": {
-    "@modern-js/app-tools": "3.8.3-ultramodern.6",
-    "@modern-js/runtime": "3.8.3-ultramodern.6",
+    "@modern-js/app-tools": "3.9.0-ultramodern.10",
+    "@modern-js/runtime": "3.9.0-ultramodern.10",
     "react": "^19.2.8",
     "react-dom": "^19.2.8",
     "react-server-dom-rspack": "0.1.0"
@@ -115,16 +117,17 @@
     }
   },
   "devDependencies": {
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.8.3-ultramodern.6",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.8.3-ultramodern.6",
-    "@rslib/core": "0.23.2",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.9.0-ultramodern.10",
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.9.0-ultramodern.10",
+    "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.9.0-ultramodern.10",
+    "@rslib/core": "1.0.0",
     "@scripts/rstest-config": "2.66.0",
-    "@tanstack/history": "1.162.1",
-    "@testing-library/react": "^16.3.2",
+    "@tanstack/history": "1.162.2",
+    "@testing-library/react": "^16.3.3",
     "@tsconfig/strictest": "2.0.8",
-    "@types/node": "^26.2.0",
+    "@types/node": "^26.4.1",
     "@types/react": "^19.2.18",
-    "@types/react-dom": "^19.2.4",
+    "@types/react-dom": "^19.2.7",
     "@typescript/native-preview": "7.0.0-dev.20260707.2",
     "react": "^19.2.8",
     "react-dom": "^19.2.8",

package/rstest.config.mts

@@ -1,4 +1,3 @@
-import path from 'node:path';
 import type { ProjectConfig } from '@rstest/core';
 import { withTestPreset } from '@scripts/rstest-config';
 
@@ -24,20 +23,13 @@ export default {
       name: 'plugin-tanstack-node',
       testEnvironment: 'node',
       include: [
-        'tests/realm-isolation.test.ts',
         'tests/router/cli.test.ts',
-        'tests/router/fastDefaults.test.ts',
         'tests/router/flightSerialization.roundtrip.test.tsx',
         'tests/router/generateRouteArtifacts.test.ts',
-        'tests/router/hooks.test.ts',
         'tests/router/loaderBridge.test.ts',
-        'tests/router/packageSurface.test.ts',
-        'tests/router/preloadRedirect.test.ts',
-        'tests/router/register.test.ts',
+        'tests/router/localisedIdentity.test.tsx',
         'tests/router/routeHooks.test.ts',
         'tests/router/serverPlugin.test.ts',
-        'tests/router/rscDecoderSecurity.test.ts',
-        'tests/router/rscPayloadRouterMatrix.test.ts',
         'tests/router/rsc.test.tsx',
         'tests/router/slotUsageSanitizer.test.ts',
         'tests/router/ssrPreload.test.ts',
@@ -46,27 +38,12 @@ export default {
       ],
       extends: commonConfig,
     }),
-    withTestPreset({
-      name: 'plugin-tanstack-router-compatibility',
-      testEnvironment: 'node',
-      include: ['tests/router/routerCompatibility.test.ts'],
-      resolve: {
-        alias: {
-          '@modern-js/runtime/router/internal': path.resolve(
-            __dirname,
-            'tests/router/fixtures/legacyRuntimeRouter.ts',
-          ),
-        },
-      },
-      extends: commonConfig,
-    }),
     withTestPreset({
       name: 'plugin-tanstack-client',
       testEnvironment: 'happy-dom',
       include: [
         'tests/router/clientHydration.test.tsx',
         'tests/router/dataMutation.test.tsx',
-        'tests/router/hydrationBoundary.test.tsx',
         'tests/router/prefetchLink.test.tsx',
         'tests/router/prefetchLinkPreload.test.tsx',
       ],