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

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/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/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,8 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     tanstackRouterProviderFactory: ()=>tanstackRouterProviderFactory
 });
-const context_namespaceObject = require("@modern-js/runtime/context");
 const external_plugin_js_namespaceObject = require("./plugin.js");
 const tanstackRouterProviderFactory = (userConfig)=>(0, external_plugin_js_namespaceObject.tanstackRouterPlugin)(userConfig);
-(0, context_namespaceObject.registerRouterProvider)('tanstack', tanstackRouterProviderFactory);
 exports.tanstackRouterProviderFactory = __webpack_exports__.tanstackRouterProviderFactory;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "tanstackRouterProviderFactory"

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/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/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/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,5 +1,3 @@
-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/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-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/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/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/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/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/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/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/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/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/package.json

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

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';
 
@@ -26,19 +25,14 @@ export default {
       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/localisedIdentity.test.tsx',
-        'tests/router/packageSurface.test.ts',
-        'tests/router/preloadRedirect.test.ts',
-        'tests/router/register.test.ts',
         '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',
@@ -47,27 +41,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',
       ],

package/src/cli/index.ts

@@ -132,6 +132,16 @@ export function tanstackRouterPlugin(
     name: '@modern-js/plugin-tanstack',
     required: ['@modern-js/runtime'],
     setup: api => {
+      const { srcDirectory, serverCompileExcludedFiles = [] } =
+        api.getAppContext();
+      api.updateAppContext({
+        serverCompileExcludedFiles: [
+          ...new Set([
+            ...serverCompileExcludedFiles,
+            path.join(srcDirectory, generatedDirName, 'register.gen.d.ts'),
+          ]),
+        ],
+      });
       const nestedRoutesForServer: Record<string, unknown> = {};
 
       const isTanstackEntrypoint = (entrypoint: Entrypoint) => {

package/src/runtime/lifecycle.ts

@@ -1,9 +1,21 @@
 /**
- * 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.
  */
+
+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,
@@ -11,6 +23,5 @@ export {
   createRouterServerSnapshot,
   getRouterRuntimeState,
   getRouterServerSnapshot,
-  type RouterLifecycleContext,
   type RouterLifecyclePhase,
-} from '@modern-js/runtime/context';
+} from '@modern-js/runtime-extensions/router-state';

package/src/runtime/plugin.node.tsx

@@ -1,10 +1,10 @@
 // @effect-diagnostics asyncFunction:off newPromise:off strictBooleanExpressions:off unnecessaryArrowBlock:off
 import {
   getGlobalEnableRsc,
-  type InternalRouterServerSnapshot,
   InternalRuntimeContext,
   type TInternalRuntimeContext,
 } from '@modern-js/runtime/context';
+import type { InternalRouterServerSnapshot } from '@modern-js/runtime-extensions/router-state';
 import {
   createRequestContext,
   type RequestContext,

package/src/runtime/prefetchLink.tsx

@@ -1,3 +1,4 @@
+import { resolvePreloadFromPrefetch } from '@modern-js/runtime-extensions';
 import {
   type AnyRouter,
   type LinkComponentProps,
@@ -8,29 +9,6 @@ import type { AnchorHTMLAttributes, ReactElement, ReactNode, Ref } from 'react';
 
 export type PrefetchBehavior = 'intent' | 'render' | 'viewport' | 'none';
 
-function resolvePreloadFromPrefetch(
-  prefetch: PrefetchBehavior | undefined,
-  preload: unknown,
-) {
-  if (typeof preload !== 'undefined') {
-    return preload;
-  }
-
-  if (prefetch === 'none') {
-    return false;
-  }
-
-  if (
-    prefetch === 'intent' ||
-    prefetch === 'render' ||
-    prefetch === 'viewport'
-  ) {
-    return prefetch;
-  }
-
-  return 'viewport';
-}
-
 export type LinkProps<
   TRouter extends AnyRouter = RegisteredRouter,
   TFrom extends string = string,

package/src/runtime/register.ts

@@ -1,16 +1,7 @@
-/**
- * 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,
   type RouterProviderPlugin,
-  registerRouterProvider,
-} from '@modern-js/runtime/context';
+} from '@modern-js/runtime-extensions/router-provider';
 import { tanstackRouterPlugin } from './plugin';
 
 // TanStack runtime plugin types its API against its own hook registry,
@@ -22,5 +13,3 @@ import { tanstackRouterPlugin } from './plugin';
 export const tanstackRouterProviderFactory: RouterProviderFactory =
   userConfig =>
     tanstackRouterPlugin(userConfig) as unknown as RouterProviderPlugin;
-
-registerRouterProvider('tanstack', tanstackRouterProviderFactory);