@bleedingdev/modern-js-plugin-tanstack 3.9.0-ultramodern.11 → 3.9.0-ultramodern.13

package/package.json

@@ -18,7 +18,7 @@
     "modern.js",
     "tanstack-router"
   ],
-  "version": "3.9.0-ultramodern.11",
+  "version": "3.9.0-ultramodern.13",
   "engines": {
     "node": ">=20"
   },
@@ -94,19 +94,19 @@
     }
   },
   "dependencies": {
-    "@modern-js/i18n-runtime-extensions": "npm:@bleedingdev/modern-js-i18n-runtime-extensions@3.9.0-ultramodern.11",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.11",
-    "@modern-js/runtime-extensions": "npm:@bleedingdev/modern-js-runtime-extensions@3.9.0-ultramodern.11",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.11",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.11",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.11",
+    "@modern-js/i18n-runtime-extensions": "npm:@bleedingdev/modern-js-i18n-runtime-extensions@3.9.0-ultramodern.13",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.13",
+    "@modern-js/runtime-extensions": "npm:@bleedingdev/modern-js-runtime-extensions@3.9.0-ultramodern.13",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.13",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.13",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.13",
     "@swc/helpers": "^0.5.23",
-    "@tanstack/react-router": "1.170.33",
-    "@tanstack/router-core": "1.171.28"
+    "@tanstack/react-router": "1.170.39",
+    "@tanstack/router-core": "1.171.32"
   },
   "peerDependencies": {
-    "@modern-js/app-tools": "3.9.0-ultramodern.11",
-    "@modern-js/runtime": "3.9.0-ultramodern.11",
+    "@modern-js/app-tools": "3.9.0-ultramodern.13",
+    "@modern-js/runtime": "3.9.0-ultramodern.13",
     "react": "^19.2.8",
     "react-dom": "^19.2.8",
     "react-server-dom-rspack": "0.1.0"
@@ -117,20 +117,20 @@
     }
   },
   "devDependencies": {
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.9.0-ultramodern.11",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.9.0-ultramodern.11",
-    "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.9.0-ultramodern.11",
-    "@rslib/core": "1.0.0",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.9.0-ultramodern.13",
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.9.0-ultramodern.13",
+    "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.9.0-ultramodern.13",
+    "@rslib/core": "1.0.2",
     "@scripts/rstest-config": "2.66.0",
-    "@tanstack/history": "1.162.2",
+    "@tanstack/history": "1.162.4",
     "@testing-library/react": "^16.3.3",
     "@tsconfig/strictest": "2.0.8",
-    "@types/node": "^26.4.1",
-    "@types/react": "^19.2.18",
-    "@types/react-dom": "^19.2.7",
+    "@types/node": "^26.6.2",
+    "@types/react": "^19.3.0",
+    "@types/react-dom": "^19.3.0",
     "@typescript/native-preview": "7.0.0-dev.20260707.2",
-    "react": "^19.2.8",
-    "react-dom": "^19.2.8",
+    "react": "^19.3.0",
+    "react-dom": "^19.3.0",
     "react-server-dom-rspack": "0.1.0"
   },
   "sideEffects": [

package/src/cli/artifacts.ts

@@ -251,5 +251,10 @@ export async function generateTanstackRouteArtifacts(opts: {
     internalPlugins: (utils as { INTERNAL_RUNTIME_PLUGINS: unknown })
       .INTERNAL_RUNTIME_PLUGINS as never,
   });
-  await cli.init({ ...runOptions, command: 'build' });
+  const { appContext } = await cli.init({ ...runOptions, command: 'build' });
+  // Preparation owns the artifact writes; there is no dev server or bundler
+  // phase after it. Release plugin resources before the headless caller exits.
+  // Failed initialization propagates unchanged: it has not returned a context
+  // whose lifecycle this caller can close.
+  await appContext.hooks.onBeforeExit.call();
 }

package/src/cli/tanstackTypes/canonicalRoutes.ts

@@ -1,7 +1,10 @@
 // @effect-diagnostics asyncFunction:off strictBooleanExpressions:off
 
 import type { NestedRouteForCli, PageRoute } from '@modern-js/types';
-import { MAIN_ENTRY_NAME } from '@modern-js/utils';
+import {
+  describeRouteTree,
+  type RouteDescriptor,
+} from '../../shared/routeDescriptor';
 
 import { toTanstackPath } from './shared';
 
@@ -16,6 +19,7 @@ const LOCALE_PARAM_SEGMENTS = new Set([
 
 type CanonicalAwareRoute = (NestedRouteForCli | PageRoute) & {
   modernCanonicalPath?: string;
+  modernLocalisedRoute?: { canonicalPath: string };
   index?: boolean;
   isRoot?: boolean;
   children?: CanonicalAwareRoute[];
@@ -101,12 +105,18 @@ export function collectCanonicalRoutesForEntry(
     }
   };
 
-  const visit = (route: CanonicalAwareRoute, parentPath: string) => {
+  const visit = (
+    descriptor: RouteDescriptor<CanonicalAwareRoute>,
+    parentPath: string,
+  ) => {
+    const { source: route, children } = descriptor;
     let currentPath = parentPath;
 
-    if (typeof route.modernCanonicalPath === 'string') {
+    const canonicalPath =
+      route.modernLocalisedRoute?.canonicalPath ?? route.modernCanonicalPath;
+    if (typeof canonicalPath === 'string') {
       hasI18nSurface = true;
-      currentPath = normalizeJoined(route.modernCanonicalPath);
+      currentPath = canonicalPath ? normalizeJoined(canonicalPath) : '';
     } else if (typeof route.path === 'string' && route.path.length > 0) {
       const segments = route.path
         .replace(/\[(.+?)\]/g, ':$1')
@@ -125,7 +135,6 @@ export function collectCanonicalRoutesForEntry(
         : parentPath;
     }
 
-    const children = route.children;
     if (children && children.length > 0) {
       for (const child of children) {
         visit(child, currentPath);
@@ -137,13 +146,9 @@ export function collectCanonicalRoutesForEntry(
     record(currentPath || '/');
   };
 
-  const rootModern = routes.find(
-    route => (route as CanonicalAwareRoute).isRoot,
-  ) as CanonicalAwareRoute | undefined;
-  const topLevel = rootModern ? (rootModern.children ?? []) : routes;
-
-  for (const route of topLevel) {
-    visit(route as CanonicalAwareRoute, '');
+  for (const route of describeRouteTree(routes as CanonicalAwareRoute[])
+    .children) {
+    visit(route, '');
   }
 
   if (!hasI18nSurface || canonicalParams.size === 0) {

package/src/cli/tanstackTypes/shared.ts

@@ -71,20 +71,6 @@ export function pickRouteSearchContractModules(
   };
 }
 
-export function isPathlessLayout(route: NestedRouteForCli | PageRoute) {
-  const extras = route as RouteExtras;
-  return (
-    extras.type === 'nested' &&
-    typeof extras.index !== 'boolean' &&
-    typeof extras.path === 'undefined'
-  );
-}
-
-export function isIndexRoute(route: NestedRouteForCli | PageRoute) {
-  const extras = route as RouteExtras;
-  return extras.type === 'nested' && Boolean(extras.index);
-}
-
 export function createRouteStaticDataSnippet(opts: {
   modernRouteId?: string;
   loaderName?: string | null;

package/src/cli/tanstackTypes/source.ts

@@ -1,25 +1,22 @@
 // @effect-diagnostics asyncFunction:off strictBooleanExpressions:off
 
-import type {
-  AppNormalizedConfig,
-  AppTools,
-  AppToolsContext,
-} from '@modern-js/app-tools';
-import { canonicaliseLocalisedRoutes } from '@modern-js/i18n-runtime-extensions';
+import type { AppToolsContext } from '@modern-js/app-tools';
 import { makeLegalIdentifier } from '@modern-js/runtime/cli';
 import type { NestedRouteForCli, PageRoute } from '@modern-js/types';
 import { upath as path } from '@modern-js/utils';
 
+import {
+  describeRouteTree,
+  type RouteDescriptor,
+} from '../../shared/routeDescriptor';
+
 import {
   createRouteStaticDataSnippet,
-  isIndexRoute,
-  isPathlessLayout,
   normalizeRelativeImport,
   pickModernLoaderModule,
   pickRouteSearchContractModules,
   quote,
   resolveFileNoExt,
-  toTanstackPath,
 } from './shared';
 
 type RouteForCli = NestedRouteForCli | PageRoute;
@@ -46,22 +43,15 @@ export async function generateTanstackRouterTypesSourceForEntry(opts: {
     appContext,
     entryName,
     generatedDirName = 'modern-tanstack',
-    routes: rawRoutes,
+    routes,
   } = opts;
-  const routes: RouteForCli[] = canonicaliseLocalisedRoutes(rawRoutes);
   const outDir = path.join(
     appContext.srcDirectory,
     generatedDirName,
     entryName,
   );
 
-  const rootModern = routes.find(r => {
-    const extras = r as RouteExtras;
-    return r && extras.type === 'nested' && extras.isRoot;
-  }) as NestedRouteForCli | undefined;
-
-  const rootExtras = rootModern as RouteExtras | undefined;
-  const topLevel = rootModern ? rootExtras?.children || [] : routes;
+  const { root: rootModern, children: topLevel } = describeRouteTree(routes);
 
   const imports: string[] = [];
   const statements: string[] = [];
@@ -92,15 +82,11 @@ export async function generateTanstackRouterTypesSourceForEntry(opts: {
         // value carries the internal `@_modern_js_src` alias, which the app's
         // tsconfig does not map — the generated file must use relative
         // imports.
-        const resolvedNoExt = await resolveRouteModuleNoExt(componentPath);
-        if (!resolvedNoExt) {
+        const relImport = await resolveRouteImport(componentPath);
+        if (!relImport) {
           return null;
         }
 
-        const relImport = normalizeRelativeImport(
-          path.relative(outDir, resolvedNoExt),
-        );
-
         const componentName = `component_${componentIndex++}`;
         imports.push(`import ${componentName} from ${quote(relImport)};`);
         return componentName;
@@ -111,7 +97,7 @@ export async function generateTanstackRouterTypesSourceForEntry(opts: {
     return pendingImportName;
   };
 
-  const resolveRouteModuleNoExt = async (aliasedNoExtPath: string) => {
+  const resolveRouteImport = async (aliasedNoExtPath: string) => {
     const prefix = `${appContext.internalSrcAlias}/`;
     let absNoExt: string;
     if (aliasedNoExtPath.startsWith(prefix)) {
@@ -124,7 +110,10 @@ export async function generateTanstackRouterTypesSourceForEntry(opts: {
       absNoExt = path.join(appContext.srcDirectory, aliasedNoExtPath);
     }
 
-    return resolveFileNoExt(absNoExt);
+    const resolvedNoExt = await resolveFileNoExt(absNoExt);
+    return resolvedNoExt
+      ? normalizeRelativeImport(path.relative(outDir, resolvedNoExt))
+      : null;
   };
 
   const getImportNamesForLoader = async (
@@ -143,15 +132,11 @@ export async function generateTanstackRouterTypesSourceForEntry(opts: {
       };
     }
 
-    const resolvedNoExt = await resolveRouteModuleNoExt(aliasedNoExtPath);
-    if (!resolvedNoExt) {
+    const relImport = await resolveRouteImport(aliasedNoExtPath);
+    if (!relImport) {
       return null;
     }
 
-    const relImport = normalizeRelativeImport(
-      path.relative(outDir, resolvedNoExt),
-    );
-
     const importName = `loader_${loaderIndex++}`;
     const actionName = hasAction
       ? importName.replace(/^loader_/, 'action_')
@@ -182,14 +167,10 @@ export async function generateTanstackRouterTypesSourceForEntry(opts: {
       return existing;
     }
 
-    const resolvedNoExt = await resolveRouteModuleNoExt(aliasedNoExtPath);
-    if (!resolvedNoExt) {
+    const relImport = await resolveRouteImport(aliasedNoExtPath);
+    if (!relImport) {
       return null;
     }
-
-    const relImport = normalizeRelativeImport(
-      path.relative(outDir, resolvedNoExt),
-    );
     const importName =
       exportName === 'validateSearch'
         ? `validateSearch_${validateSearchIndex++}`
@@ -217,15 +198,8 @@ export async function generateTanstackRouterTypesSourceForEntry(opts: {
     return reserveRouteVarName(`route_${base}`);
   };
 
-  const buildRoute = async (opts: {
-    parentVar: string;
-    route: NestedRouteForCli | PageRoute;
-  }): Promise<string> => {
-    const { parentVar, route } = opts;
-
-    const varName = createRouteVarName(route);
+  const createRouteOptions = async (route: RouteForCli, hasSplat: boolean) => {
     const routeExtras = route as RouteExtras;
-
     const loaderInfo = pickModernLoaderModule(route);
     const routeAction = routeExtras.action;
     const loaderImports = loaderInfo
@@ -251,10 +225,7 @@ export async function generateTanstackRouterTypesSourceForEntry(opts: {
         )
       : null;
 
-    const rawPath = routeExtras.path;
-    const hasSplat = typeof rawPath === 'string' && rawPath.includes('*');
-
-    const routeOpts: string[] = [`getParentRoute: () => ${parentVar},`];
+    const routeOpts: string[] = [];
 
     const componentName = await getImportNameForComponent(
       routeExtras._component,
@@ -263,14 +234,6 @@ export async function generateTanstackRouterTypesSourceForEntry(opts: {
       routeOpts.push(`component: ${componentName},`);
     }
 
-    if (isPathlessLayout(route)) {
-      const id = routeExtras.id;
-      routeOpts.push(`id: ${quote(id || 'pathless')},`);
-    } else {
-      const p = isIndexRoute(route) ? '/' : toTanstackPath(rawPath || '');
-      routeOpts.push(`path: ${quote(p)},`);
-    }
-
     if (loaderName) {
       routeOpts.push(
         `loader: modernLoaderToTanstack({ hasSplat: ${hasSplat} }, ${loaderName}),`,
@@ -292,7 +255,22 @@ export async function generateTanstackRouterTypesSourceForEntry(opts: {
       routeOpts.push(staticDataSnippet);
     }
 
-    const children = routeExtras.children;
+    return routeOpts;
+  };
+
+  const buildRoute = async (
+    descriptor: RouteDescriptor<RouteForCli>,
+    parentVar: string,
+  ): Promise<string> => {
+    const { source: route, location, hasSplat, children } = descriptor;
+    const varName = createRouteVarName(route);
+    const routeOpts = [
+      `getParentRoute: () => ${parentVar},`,
+      ...Object.entries(location).map(
+        ([key, value]) => `${key}: ${quote(value)},`,
+      ),
+      ...(await createRouteOptions(route, hasSplat)),
+    ];
     const hasChildren = Boolean(children && children.length > 0);
     const routeCtorVarName = hasChildren
       ? reserveRouteVarName(`${varName}__base`)
@@ -305,9 +283,7 @@ export async function generateTanstackRouterTypesSourceForEntry(opts: {
     if (children && children.length > 0) {
       const childVars: string[] = [];
       for (const child of children) {
-        childVars.push(
-          await buildRoute({ parentVar: routeCtorVarName, route: child }),
-        );
+        childVars.push(await buildRoute(child, routeCtorVarName));
       }
       statements.push(
         `const ${varName} = ${routeCtorVarName}.addChildren([${childVars.join(', ')}]);`,
@@ -317,60 +293,14 @@ export async function generateTanstackRouterTypesSourceForEntry(opts: {
     return varName;
   };
 
-  const rootLoaderInfo = rootModern ? pickModernLoaderModule(rootModern) : null;
-  const rootAction = rootExtras?.action;
-  const rootLoaderImports = rootLoaderInfo?.loaderPath
-    ? await getImportNamesForLoader(
-        rootLoaderInfo.loaderPath,
-        rootLoaderInfo.inline,
-        Boolean(
-          rootLoaderInfo.inline && rootAction === rootLoaderInfo.loaderPath,
-        ),
-      )
-    : null;
-  const rootLoaderName = rootLoaderImports?.loaderName || null;
-  const rootActionName = rootLoaderImports?.actionName || null;
-  const rootSearchContractInfo = rootModern
-    ? pickRouteSearchContractModules(rootModern)
-    : null;
-  const rootValidateSearchName = rootSearchContractInfo?.validateSearchPath
-    ? await getImportNameForSearchContract(
-        rootSearchContractInfo.validateSearchPath,
-        'validateSearch',
-      )
-    : null;
-  const rootLoaderDepsName = rootSearchContractInfo?.loaderDepsPath
-    ? await getImportNameForSearchContract(
-        rootSearchContractInfo.loaderDepsPath,
-        'loaderDeps',
-      )
-    : null;
-
   const topLevelVars: string[] = [];
   for (const route of topLevel) {
-    topLevelVars.push(await buildRoute({ parentVar: 'rootRoute', route }));
+    topLevelVars.push(await buildRoute(route, 'rootRoute'));
   }
 
-  const rootOpts: string[] = [];
-
-  const rootComponentName = await getImportNameForComponent(
-    rootExtras?._component,
-  );
-  if (rootComponentName) {
-    rootOpts.push(`component: ${rootComponentName},`);
-  }
-
-  if (rootLoaderName) {
-    rootOpts.push(
-      `loader: modernLoaderToTanstack({ hasSplat: false }, ${rootLoaderName}),`,
-    );
-  }
-  if (rootValidateSearchName) {
-    rootOpts.push(`validateSearch: ${rootValidateSearchName},`);
-  }
-  if (rootLoaderDepsName) {
-    rootOpts.push(`loaderDeps: ${rootLoaderDepsName},`);
-  }
+  const rootOpts = rootModern
+    ? await createRouteOptions(rootModern, false)
+    : [];
 
   const routerGenTs = `// This file is auto-generated by Modern.js. Do not edit manually.
 
@@ -388,13 +318,7 @@ ${imports.join('\n')}
 
 export const rootRoute = createRootRouteWithContext<ModernRouterContext>()({
   ${rootOpts.join('\n  ')}
-  ${
-    createRouteStaticDataSnippet({
-      modernRouteId: rootExtras?.id,
-      loaderName: rootLoaderName,
-      actionName: rootActionName,
-    }) || ''
-  }
+
 });
 
 ${statements.join('\n\n')}

package/src/runtime/lifecycle.ts

@@ -19,7 +19,6 @@ export type RouterLifecycleContext = NativeRouterLifecycleContext & {
 export {
   applyRouterRuntimeState,
   applyRouterServerPrepareResult,
-  createRouterRuntimeState,
   createRouterServerSnapshot,
   getRouterRuntimeState,
   getRouterServerSnapshot,

package/src/runtime/loaderBridge.ts

@@ -98,15 +98,15 @@ type LoaderLikeContext = {
   params?: Record<string, string>;
 };
 
-function getLoaderSignal(ctx: LoaderLikeContext | undefined): AbortSignal {
-  const abortSignal = ctx?.abortController?.signal;
-  if (abortSignal instanceof AbortSignal) {
-    return abortSignal;
-  }
-  if (ctx?.signal instanceof AbortSignal) {
-    return ctx.signal;
-  }
-  return new AbortController().signal;
+export function getLoaderSignal(
+  ctx: LoaderLikeContext | undefined,
+): AbortSignal {
+  const matchSignal = ctx?.abortController?.signal ?? ctx?.signal;
+  const requestSignal = ctx?.context?.request?.signal;
+  const signals = [matchSignal, requestSignal].filter(
+    (signal): signal is AbortSignal => signal instanceof AbortSignal,
+  );
+  return AbortSignal.any(signals);
 }
 
 export function getLoaderHref(ctx: LoaderLikeContext | undefined): string {

package/src/runtime/navigation.ts

@@ -0,0 +1,78 @@
+import type {
+  RouterNavigationCapability,
+  RouterNavigationSnapshot,
+} from '@modern-js/runtime-extensions/router-state';
+import type { AnyRouter } from '@tanstack/react-router';
+import { Link } from './prefetchLink';
+
+/** Native TanStack navigation, exposed through the provider contract. */
+export function createTanstackNavigation(
+  router: AnyRouter,
+): RouterNavigationCapability {
+  let location: AnyRouter['state']['location'] | undefined;
+  let matches: AnyRouter['state']['matches'] | undefined;
+  let snapshot: RouterNavigationSnapshot;
+  return {
+    Link: Link as RouterNavigationCapability['Link'],
+    getSnapshot() {
+      const state = router.state;
+      if (
+        location !== state.location ||
+        matches === undefined ||
+        matches.length !== state.matches.length ||
+        matches.some(
+          (match, index) => match.params !== state.matches[index]?.params,
+        )
+      ) {
+        location = state.location;
+        matches = state.matches;
+        snapshot = {
+          location: {
+            pathname: location.pathname,
+            search: location.searchStr,
+            hash:
+              location.hash !== '' ? `#${location.hash.replace(/^#/, '')}` : '',
+          },
+          params: Object.assign({}, ...matches.map(match => match.params)),
+        };
+      }
+      return snapshot;
+    },
+    subscribe(listener) {
+      const stops = (
+        ['onBeforeNavigate', 'onBeforeLoad', 'onLoad', 'onResolved'] as const
+      ).map(event => router.subscribe(event, listener));
+      return () => {
+        for (const stop of stops) stop();
+      };
+    },
+    navigate(href, options) {
+      return router.navigate({
+        to: href,
+        replace: options?.replace,
+        ...(options?.state === undefined
+          ? {}
+          : { state: options.state as never }),
+      });
+    },
+    createLinkProps(target) {
+      const preload =
+        target.preload !== undefined
+          ? target.preload
+          : target.prefetch === 'none'
+            ? false
+            : target.prefetch;
+      return {
+        to: target.pathname,
+        ...(target.search !== undefined ? { search: target.search } : {}),
+        ...(target.hash !== undefined && target.hash !== ''
+          ? { hash: target.hash }
+          : {}),
+        ...(target.hashScrollIntoView === undefined
+          ? {}
+          : { hashScrollIntoView: target.hashScrollIntoView }),
+        ...(preload === undefined ? {} : { preload }),
+      };
+    },
+  };
+}