@bleedingdev/modern-js-plugin-tanstack 3.5.0-ultramodern.2 → 3.5.0-ultramodern.21

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

@@ -1,5 +1,3 @@
-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';
@@ -8,14 +6,20 @@ export type TanstackRouterRuntimeConfig = {
     router?: Partial<RouterConfig>;
     [key: string]: unknown;
 };
-type TanstackRouterRuntimeExtends = Required<RuntimePluginExtends<TanstackRouterRuntimeConfig, TInternalRuntimeContext>> & {
-    extendHooks: RouterExtendsHooks;
+type RuntimeInterrupt = (value?: unknown) => unknown;
+export type TanstackRouterPluginAPI = {
+    getRuntimeConfig: () => TanstackRouterRuntimeConfig;
+    getHooks: () => RouterExtendsHooks;
+    onBeforeRender: (listener: (context: TInternalRuntimeContext, interrupt: RuntimeInterrupt) => unknown) => void;
+    wrapRoot: (listener: (App: any) => any) => void;
+    [key: string]: any;
 };
-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 type TanstackRouterRuntimePlugin = {
+    name?: string;
+    registryHooks?: RouterExtendsHooks;
+    setup?: (api: TanstackRouterPluginAPI) => unknown;
+    [key: string]: unknown;
 };
+export declare function getMergedRouterConfig(api: TanstackRouterPluginAPI, userConfig: Partial<RouterConfig>): RouterConfig;
+export declare function getFinalRouteConfig(mergedConfig: RouterConfig): RouterConfig['routesConfig'];
 export {};

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

@@ -1,8 +1,46 @@
-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, InternalRouterRuntimeState, InternalRouterServerSnapshot, RouterFramework, RouterRouteMatchSnapshot, RouterServerPrepareResult, } from '@modern-js/runtime/context';
+export type BuiltInRouterFramework = 'react-router' | 'tanstack';
+export type RouterFramework = BuiltInRouterFramework | (string & {});
+export type ModernRoute = {
+    type: 'nested' | 'page';
+    path?: string;
+    id?: string;
+    component?: React.ComponentType | string;
+    children?: ModernRoute[];
+    [key: string]: any;
+};
+export type RouterRouteMatchSnapshot = {
+    routeId: string;
+    assetRouteId?: string;
+    pathname?: string;
+    params?: Record<string, string>;
+};
+export type 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 type InternalRouterRuntimeState = {
+    framework: RouterFramework;
+    basename?: string;
+    instance?: unknown;
+    hydrationScript?: string;
+    hydrationScripts?: string[];
+    matchedRouteIds?: string[];
+    matches?: RouterRouteMatchSnapshot[];
+    serverSnapshot?: InternalRouterServerSnapshot;
+    cleanup?: () => void | Promise<void>;
+};
 /**
  * TanStack-specific router config. Unlike the react-router provider config,
  * this intentionally has no `oldVersion`/`future` fields — those are
@@ -12,7 +50,7 @@ export type RouterConfig = {
     framework?: RouterFramework;
     routesConfig: {
         globalApp?: React.ComponentType<any>;
-        routes?: (NestedRoute | PageRoute)[];
+        routes?: ModernRoute[];
     };
     serverBase?: string[];
     supportHtml5History?: boolean;

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

@@ -1,10 +1,11 @@
 import type { RouteObject } from '@modern-js/runtime-utils/router';
-import type { NestedRoute, PageRoute, SSRMode } from '@modern-js/types';
 import React from 'react';
+import type { ModernRoute } from './types';
+export type SSRMode = 'string' | 'stream';
 type RouterConfig = {
     routesConfig: {
         globalApp?: React.ComponentType<any>;
-        routes?: (NestedRoute | PageRoute)[];
+        routes?: ModernRoute[];
     };
 };
 type GlobalAppProps = {
@@ -21,7 +22,7 @@ export type ModernRouteObject = RouteObject & {
         default: React.ComponentType;
     }>;
 };
-export declare function getRouteObjects(routes: (NestedRoute | PageRoute)[], { globalApp, ssrMode, props, }: {
+export declare function getRouteObjects(routes: ModernRoute[], { globalApp, ssrMode, props, }: {
     globalApp?: React.ComponentType<GlobalAppProps>;
     ssrMode?: SSRMode;
     props?: Record<string, unknown>;

package/package.json

@@ -18,7 +18,7 @@
     "modern.js",
     "tanstack-router"
   ],
-  "version": "3.5.0-ultramodern.2",
+  "version": "3.5.0-ultramodern.21",
   "engines": {
     "node": ">=20"
   },
@@ -77,13 +77,13 @@
     "@swc/helpers": "^0.5.23",
     "@tanstack/react-router": "1.170.16",
     "@tanstack/router-core": "1.171.13",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.5.0-ultramodern.2",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.5.0-ultramodern.2",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.2",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.2"
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.5.0-ultramodern.21",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.21",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.5.0-ultramodern.21",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.21"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "3.5.0-ultramodern.2",
+    "@modern-js/runtime": "3.5.0-ultramodern.21",
     "react": "^19.2.7",
     "react-dom": "^19.2.7"
   },
@@ -98,9 +98,9 @@
     "@typescript/native-preview": "7.0.0-dev.20260628.1",
     "react": "^19.2.7",
     "react-dom": "^19.2.7",
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.5.0-ultramodern.2",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.5.0-ultramodern.21",
     "@scripts/rstest-config": "2.66.0",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.5.0-ultramodern.2"
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.5.0-ultramodern.21"
   },
   "sideEffects": [
     "./src/runtime/register.ts",

package/src/runtime/pluginCore.ts

@@ -1,5 +1,3 @@
-import type { Plugin, RuntimePluginExtends } from '@modern-js/plugin';
-import type { RuntimePluginAPI } from '@modern-js/plugin/runtime';
 import {
   getGlobalLayoutApp,
   getGlobalRoutes,
@@ -15,19 +13,27 @@ export type TanstackRouterRuntimeConfig = {
   [key: string]: unknown;
 };
 
-type TanstackRouterRuntimeExtends = Required<
-  RuntimePluginExtends<TanstackRouterRuntimeConfig, TInternalRuntimeContext>
-> & {
-  extendHooks: RouterExtendsHooks;
-};
+type RuntimeInterrupt = (value?: unknown) => unknown;
 
-export type TanstackRouterPluginAPI =
-  RuntimePluginAPI<TanstackRouterRuntimeExtends>;
+export type TanstackRouterPluginAPI = {
+  getRuntimeConfig: () => TanstackRouterRuntimeConfig;
+  getHooks: () => RouterExtendsHooks;
+  onBeforeRender: (
+    listener: (
+      context: TInternalRuntimeContext,
+      interrupt: RuntimeInterrupt,
+    ) => unknown,
+  ) => void;
+  wrapRoot: (listener: (App: any) => any) => void;
+  [key: string]: any;
+};
 
-export type TanstackRouterRuntimePlugin = Plugin<
-  TanstackRouterPluginAPI,
-  TInternalRuntimeContext
->;
+export type TanstackRouterRuntimePlugin = {
+  name?: string;
+  registryHooks?: RouterExtendsHooks;
+  setup?: (api: TanstackRouterPluginAPI) => unknown;
+  [key: string]: unknown;
+};
 
 export function getMergedRouterConfig(
   api: TanstackRouterPluginAPI,
@@ -39,9 +45,11 @@ export function getMergedRouterConfig(
   return merge(pluginConfig.router || {}, userConfig) as RouterConfig;
 }
 
-export function getFinalRouteConfig(mergedConfig: RouterConfig) {
+export function getFinalRouteConfig(
+  mergedConfig: RouterConfig,
+): RouterConfig['routesConfig'] {
   return {
-    routes: getGlobalRoutes(),
+    routes: getGlobalRoutes() as RouterConfig['routesConfig']['routes'],
     globalApp: getGlobalLayoutApp(),
     ...mergedConfig.routesConfig,
   };

package/src/runtime/types.ts

@@ -1,21 +1,51 @@
-import type {
-  RouterFramework,
-  // The router runtime state types are owned by @modern-js/runtime; they are
-  // imported through the `/context` seam instead of being copied here so
-  // upstream fixes propagate to this package automatically.
-} 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,
-  InternalRouterRuntimeState,
-  InternalRouterServerSnapshot,
-  RouterFramework,
-  RouterRouteMatchSnapshot,
-  RouterServerPrepareResult,
-} from '@modern-js/runtime/context';
+export type BuiltInRouterFramework = 'react-router' | 'tanstack';
+export type RouterFramework = BuiltInRouterFramework | (string & {});
+
+export type ModernRoute = {
+  type: 'nested' | 'page';
+  path?: string;
+  id?: string;
+  component?: React.ComponentType | string;
+  children?: ModernRoute[];
+  [key: string]: any;
+};
+
+export type RouterRouteMatchSnapshot = {
+  routeId: string;
+  assetRouteId?: string;
+  pathname?: string;
+  params?: Record<string, string>;
+};
+
+export type 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 type InternalRouterRuntimeState = {
+  framework: RouterFramework;
+  basename?: string;
+  instance?: unknown;
+  hydrationScript?: string;
+  hydrationScripts?: string[];
+  matchedRouteIds?: string[];
+  matches?: RouterRouteMatchSnapshot[];
+  serverSnapshot?: InternalRouterServerSnapshot;
+  cleanup?: () => void | Promise<void>;
+};
 
 /**
  * TanStack-specific router config. Unlike the react-router provider config,
@@ -26,7 +56,7 @@ export type RouterConfig = {
   framework?: RouterFramework;
   routesConfig: {
     globalApp?: React.ComponentType<any>;
-    routes?: (NestedRoute | PageRoute)[];
+    routes?: ModernRoute[];
   };
   serverBase?: string[];
   supportHtml5History?: boolean;

package/src/runtime/utils.tsx

@@ -1,12 +1,14 @@
 // @effect-diagnostics strictBooleanExpressions:off
 import type { RouteObject } from '@modern-js/runtime-utils/router';
-import type { NestedRoute, PageRoute, SSRMode } from '@modern-js/types';
 import React from 'react';
+import type { ModernRoute } from './types';
+
+export type SSRMode = 'string' | 'stream';
 
 type RouterConfig = {
   routesConfig: {
     globalApp?: React.ComponentType<any>;
-    routes?: (NestedRoute | PageRoute)[];
+    routes?: ModernRoute[];
   };
 };
 
@@ -29,7 +31,7 @@ export type ModernRouteObject = RouteObject & {
 };
 
 export function getRouteObjects(
-  routes: (NestedRoute | PageRoute)[],
+  routes: ModernRoute[],
   {
     globalApp,
     ssrMode,