@bleedingdev/modern-js-plugin-tanstack 3.5.0-ultramodern.3 → 3.5.0-ultramodern.30

package/dist/cjs/cli/index.js

@@ -55,6 +55,7 @@ var __webpack_exports__ = {};
         collectCanonicalRoutesForEntry: ()=>external_tanstackTypes_js_namespaceObject.collectCanonicalRoutesForEntry,
         createTanstackRsbuildRouteSplittingProfile: ()=>external_routeSplitting_js_namespaceObject.createTanstackRsbuildRouteSplittingProfile,
         default: ()=>src_cli,
+        generateTanstackRouteArtifacts: ()=>generateTanstackRouteArtifacts,
         generateTanstackRouterTypesSourceForEntry: ()=>external_tanstackTypes_js_namespaceObject.generateTanstackRouterTypesSourceForEntry,
         resolveTanstackRouteCodeSplittingEnabled: ()=>external_routeSplitting_js_namespaceObject.resolveTanstackRouteCodeSplittingEnabled,
         tanstackRouterPlugin: ()=>tanstackRouterPlugin,
@@ -295,11 +296,35 @@ ${canonicalRoutesAugmentation}`;
             }
         };
     }
+    async function generateTanstackRouteArtifacts(opts) {
+        const [{ createRunOptions }, { cli }, utils] = await Promise.all([
+            import("@modern-js/app-tools/cli/run"),
+            import("@modern-js/plugin/cli"),
+            import("@modern-js/utils")
+        ]);
+        process.env.MODERN_ARGV = 'node modern build';
+        process.env.NODE_ENV = process.env.NODE_ENV || 'production';
+        const { findExists, CONFIG_FILE_EXTENSIONS } = utils;
+        const configFileBase = external_node_path_default().resolve(opts.appDirectory, 'modern.config');
+        const resolvedConfigFile = findExists(CONFIG_FILE_EXTENSIONS.map((extension)=>`${configFileBase}${extension}`));
+        if (!resolvedConfigFile) throw new Error(`[plugin-tanstack] Unable to locate a Modern.js config file (modern.config.{${CONFIG_FILE_EXTENSIONS.map((extension)=>extension.slice(1)).join(',')}}) in ${opts.appDirectory}. TanStack route generation requires the app config to resolve its plugins.`);
+        const runOptions = await createRunOptions({
+            cwd: opts.appDirectory,
+            configFile: configFileBase,
+            version: opts.version || process.env.MODERN_JS_VERSION || '0.0.0-routes-generate',
+            internalPlugins: utils.INTERNAL_RUNTIME_PLUGINS
+        });
+        await cli.init({
+            ...runOptions,
+            command: 'build'
+        });
+    }
     const src_cli = tanstackRouterPlugin;
 })();
 exports.collectCanonicalRoutesForEntry = __webpack_exports__.collectCanonicalRoutesForEntry;
 exports.createTanstackRsbuildRouteSplittingProfile = __webpack_exports__.createTanstackRsbuildRouteSplittingProfile;
 exports["default"] = __webpack_exports__["default"];
+exports.generateTanstackRouteArtifacts = __webpack_exports__.generateTanstackRouteArtifacts;
 exports.generateTanstackRouterTypesSourceForEntry = __webpack_exports__.generateTanstackRouterTypesSourceForEntry;
 exports.resolveTanstackRouteCodeSplittingEnabled = __webpack_exports__.resolveTanstackRouteCodeSplittingEnabled;
 exports.tanstackRouterPlugin = __webpack_exports__.tanstackRouterPlugin;
@@ -309,6 +334,7 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "collectCanonicalRoutesForEntry",
     "createTanstackRsbuildRouteSplittingProfile",
     "default",
+    "generateTanstackRouteArtifacts",
     "generateTanstackRouterTypesSourceForEntry",
     "resolveTanstackRouteCodeSplittingEnabled",
     "tanstackRouterPlugin",

package/dist/cjs/runtime/plugin.node.js

@@ -167,13 +167,14 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                 if (!modifiedRouteObjects.length) return;
                 const { request, nonce, baseUrl, loaderFailureMode = 'errorBoundary' } = context.ssrContext;
                 const _basename = '/' === baseUrl ? (0, external_utils_js_namespaceObject.urlJoin)(baseUrl, basename || '') : baseUrl;
-                const initialHref = createGetSsrHref(request.raw);
-                const isRSCNavigation = enableRsc && 'true' === request.raw.headers.get('x-rsc-tree');
+                const rawRequest = request.raw;
+                const initialHref = createGetSsrHref(rawRequest);
+                const isRSCNavigation = enableRsc && 'true' === rawRequest.headers.get('x-rsc-tree');
                 const requestContext = (0, node_namespaceObject.createRequestContext)(context.ssrContext?.loaderContext);
                 const controller = new AbortController();
-                const ssrRequest = new Request(request.raw.url, {
+                const ssrRequest = new Request(rawRequest.url, {
                     method: 'GET',
-                    headers: request.raw.headers,
+                    headers: rawRequest.headers,
                     signal: controller.signal
                 });
                 const routerContext = {
@@ -201,7 +202,7 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                     history,
                     basepath: '/',
                     rewrite,
-                    origin: new URL(request.raw.url).origin,
+                    origin: new URL(rawRequest.url).origin,
                     ssr: {
                         nonce
                     },
@@ -230,14 +231,14 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                 }
                 const routerErrors = collectRouterErrors(tanstackRouter);
                 if (routerErrors && 'clientRender' === loaderFailureMode) {
-                    context.ssrContext?.response.status(200);
+                    context.ssrContext?.response?.status(200);
                     try {
                         serverRouter.serverSsr?.cleanup?.();
                     } catch  {}
                     throw Object.values(routerErrors)[0];
                 }
                 await preloadMatchedRouteComponents(serverRouter);
-                context.ssrContext?.response.status(tanstackRouter.state.statusCode);
+                context.ssrContext?.response?.status(tanstackRouter.state.statusCode);
                 await serverRouter.serverSsr?.dehydrate?.();
                 if (isRSCNavigation) {
                     await waitForRouterSerialization(serverRouter);

package/dist/cjs/runtime/prefetchLink.js

@@ -40,10 +40,23 @@ function resolvePreloadFromPrefetch(prefetch, preload) {
     return 'viewport';
 }
 const LinkComponentImpl = (props)=>{
-    const { prefetch, preload, ...rest } = props;
-    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(react_router_namespaceObject.Link, {
+    const { prefetch, preload, 'aria-current': ariaCurrentProp, ref, children, ...rest } = props;
+    const hasAriaCurrentOverride = 'aria-current' in props;
+    const linkOptions = {
         ...rest,
         preload: resolvePreloadFromPrefetch(prefetch, preload)
+    };
+    const linkProps = (0, react_router_namespaceObject.useLinkProps)(linkOptions, ref);
+    const { disabled: _disabled, type: _type, ...anchorProps } = linkProps;
+    if (hasAriaCurrentOverride) if (false === ariaCurrentProp || void 0 === ariaCurrentProp) delete anchorProps['aria-current'];
+    else anchorProps['aria-current'] = ariaCurrentProp;
+    const resolvedChildren = 'function' == typeof children ? children({
+        isActive: 'active' === anchorProps['data-status'],
+        isTransitioning: 'transitioning' === anchorProps['data-transitioning']
+    }) : children;
+    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("a", {
+        ...anchorProps,
+        children: resolvedChildren
     });
 };
 const Link = LinkComponentImpl;

package/dist/esm/cli/index.mjs

@@ -238,6 +238,29 @@ function tanstackRouterPlugin(options = {}) {
         }
     };
 }
+async function generateTanstackRouteArtifacts(opts) {
+    const [{ createRunOptions }, { cli }, utils] = await Promise.all([
+        import("@modern-js/app-tools/cli/run"),
+        import("@modern-js/plugin/cli"),
+        import("@modern-js/utils")
+    ]);
+    process.env.MODERN_ARGV = 'node modern build';
+    process.env.NODE_ENV = process.env.NODE_ENV || 'production';
+    const { findExists, CONFIG_FILE_EXTENSIONS } = utils;
+    const configFileBase = node_path.resolve(opts.appDirectory, 'modern.config');
+    const resolvedConfigFile = findExists(CONFIG_FILE_EXTENSIONS.map((extension)=>`${configFileBase}${extension}`));
+    if (!resolvedConfigFile) throw new Error(`[plugin-tanstack] Unable to locate a Modern.js config file (modern.config.{${CONFIG_FILE_EXTENSIONS.map((extension)=>extension.slice(1)).join(',')}}) in ${opts.appDirectory}. TanStack route generation requires the app config to resolve its plugins.`);
+    const runOptions = await createRunOptions({
+        cwd: opts.appDirectory,
+        configFile: configFileBase,
+        version: opts.version || process.env.MODERN_JS_VERSION || '0.0.0-routes-generate',
+        internalPlugins: utils.INTERNAL_RUNTIME_PLUGINS
+    });
+    await cli.init({
+        ...runOptions,
+        command: 'build'
+    });
+}
 const src_cli = tanstackRouterPlugin;
 export default src_cli;
-export { collectCanonicalRoutesForEntry, createTanstackRsbuildRouteSplittingProfile, generateTanstackRouterTypesSourceForEntry, resolveTanstackRouteCodeSplittingEnabled, tanstackRouterPlugin, writeTanstackRegisterFile, writeTanstackRouterTypesForEntries };
+export { collectCanonicalRoutesForEntry, createTanstackRsbuildRouteSplittingProfile, generateTanstackRouteArtifacts, generateTanstackRouterTypesSourceForEntry, resolveTanstackRouteCodeSplittingEnabled, tanstackRouterPlugin, writeTanstackRegisterFile, writeTanstackRouterTypesForEntries };

package/dist/esm/runtime/plugin.node.mjs

@@ -134,13 +134,14 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                 if (!modifiedRouteObjects.length) return;
                 const { request, nonce, baseUrl, loaderFailureMode = 'errorBoundary' } = context.ssrContext;
                 const _basename = '/' === baseUrl ? urlJoin(baseUrl, basename || '') : baseUrl;
-                const initialHref = createGetSsrHref(request.raw);
-                const isRSCNavigation = enableRsc && 'true' === request.raw.headers.get('x-rsc-tree');
+                const rawRequest = request.raw;
+                const initialHref = createGetSsrHref(rawRequest);
+                const isRSCNavigation = enableRsc && 'true' === rawRequest.headers.get('x-rsc-tree');
                 const requestContext = createRequestContext(context.ssrContext?.loaderContext);
                 const controller = new AbortController();
-                const ssrRequest = new Request(request.raw.url, {
+                const ssrRequest = new Request(rawRequest.url, {
                     method: 'GET',
-                    headers: request.raw.headers,
+                    headers: rawRequest.headers,
                     signal: controller.signal
                 });
                 const routerContext = {
@@ -168,7 +169,7 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                     history,
                     basepath: '/',
                     rewrite,
-                    origin: new URL(request.raw.url).origin,
+                    origin: new URL(rawRequest.url).origin,
                     ssr: {
                         nonce
                     },
@@ -197,14 +198,14 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                 }
                 const routerErrors = collectRouterErrors(tanstackRouter);
                 if (routerErrors && 'clientRender' === loaderFailureMode) {
-                    context.ssrContext?.response.status(200);
+                    context.ssrContext?.response?.status(200);
                     try {
                         serverRouter.serverSsr?.cleanup?.();
                     } catch  {}
                     throw Object.values(routerErrors)[0];
                 }
                 await preloadMatchedRouteComponents(serverRouter);
-                context.ssrContext?.response.status(tanstackRouter.state.statusCode);
+                context.ssrContext?.response?.status(tanstackRouter.state.statusCode);
                 await serverRouter.serverSsr?.dehydrate?.();
                 if (isRSCNavigation) {
                     await waitForRouterSerialization(serverRouter);

package/dist/esm/runtime/prefetchLink.mjs

@@ -1,5 +1,5 @@
 import { jsx } from "react/jsx-runtime";
-import { Link } from "@tanstack/react-router";
+import { useLinkProps } from "@tanstack/react-router";
 function resolvePreloadFromPrefetch(prefetch, preload) {
     if (void 0 !== preload) return preload;
     if ('none' === prefetch) return false;
@@ -7,12 +7,25 @@ function resolvePreloadFromPrefetch(prefetch, preload) {
     return 'viewport';
 }
 const LinkComponentImpl = (props)=>{
-    const { prefetch, preload, ...rest } = props;
-    return /*#__PURE__*/ jsx(Link, {
+    const { prefetch, preload, 'aria-current': ariaCurrentProp, ref, children, ...rest } = props;
+    const hasAriaCurrentOverride = 'aria-current' in props;
+    const linkOptions = {
         ...rest,
         preload: resolvePreloadFromPrefetch(prefetch, preload)
+    };
+    const linkProps = useLinkProps(linkOptions, ref);
+    const { disabled: _disabled, type: _type, ...anchorProps } = linkProps;
+    if (hasAriaCurrentOverride) if (false === ariaCurrentProp || void 0 === ariaCurrentProp) delete anchorProps['aria-current'];
+    else anchorProps['aria-current'] = ariaCurrentProp;
+    const resolvedChildren = 'function' == typeof children ? children({
+        isActive: 'active' === anchorProps['data-status'],
+        isTransitioning: 'transitioning' === anchorProps['data-transitioning']
+    }) : children;
+    return /*#__PURE__*/ jsx("a", {
+        ...anchorProps,
+        children: resolvedChildren
     });
 };
-const prefetchLink_Link = LinkComponentImpl;
+const Link = LinkComponentImpl;
 const NavLink = LinkComponentImpl;
-export { NavLink, prefetchLink_Link as Link };
+export { Link, NavLink };

package/dist/esm-node/cli/index.mjs

@@ -242,6 +242,29 @@ function tanstackRouterPlugin(options = {}) {
         }
     };
 }
+async function generateTanstackRouteArtifacts(opts) {
+    const [{ createRunOptions }, { cli }, utils] = await Promise.all([
+        import("@modern-js/app-tools/cli/run"),
+        import("@modern-js/plugin/cli"),
+        import("@modern-js/utils")
+    ]);
+    process.env.MODERN_ARGV = 'node modern build';
+    process.env.NODE_ENV = process.env.NODE_ENV || 'production';
+    const { findExists, CONFIG_FILE_EXTENSIONS } = utils;
+    const configFileBase = node_path.resolve(opts.appDirectory, 'modern.config');
+    const resolvedConfigFile = findExists(CONFIG_FILE_EXTENSIONS.map((extension)=>`${configFileBase}${extension}`));
+    if (!resolvedConfigFile) throw new Error(`[plugin-tanstack] Unable to locate a Modern.js config file (modern.config.{${CONFIG_FILE_EXTENSIONS.map((extension)=>extension.slice(1)).join(',')}}) in ${opts.appDirectory}. TanStack route generation requires the app config to resolve its plugins.`);
+    const runOptions = await createRunOptions({
+        cwd: opts.appDirectory,
+        configFile: configFileBase,
+        version: opts.version || process.env.MODERN_JS_VERSION || '0.0.0-routes-generate',
+        internalPlugins: utils.INTERNAL_RUNTIME_PLUGINS
+    });
+    await cli.init({
+        ...runOptions,
+        command: 'build'
+    });
+}
 const src_cli = tanstackRouterPlugin;
 export default src_cli;
-export { collectCanonicalRoutesForEntry, createTanstackRsbuildRouteSplittingProfile, generateTanstackRouterTypesSourceForEntry, resolveTanstackRouteCodeSplittingEnabled, tanstackRouterPlugin, writeTanstackRegisterFile, writeTanstackRouterTypesForEntries };
+export { collectCanonicalRoutesForEntry, createTanstackRsbuildRouteSplittingProfile, generateTanstackRouteArtifacts, generateTanstackRouterTypesSourceForEntry, resolveTanstackRouteCodeSplittingEnabled, tanstackRouterPlugin, writeTanstackRegisterFile, writeTanstackRouterTypesForEntries };

package/dist/esm-node/runtime/plugin.node.mjs

@@ -135,13 +135,14 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                 if (!modifiedRouteObjects.length) return;
                 const { request, nonce, baseUrl, loaderFailureMode = 'errorBoundary' } = context.ssrContext;
                 const _basename = '/' === baseUrl ? urlJoin(baseUrl, basename || '') : baseUrl;
-                const initialHref = createGetSsrHref(request.raw);
-                const isRSCNavigation = enableRsc && 'true' === request.raw.headers.get('x-rsc-tree');
+                const rawRequest = request.raw;
+                const initialHref = createGetSsrHref(rawRequest);
+                const isRSCNavigation = enableRsc && 'true' === rawRequest.headers.get('x-rsc-tree');
                 const requestContext = createRequestContext(context.ssrContext?.loaderContext);
                 const controller = new AbortController();
-                const ssrRequest = new Request(request.raw.url, {
+                const ssrRequest = new Request(rawRequest.url, {
                     method: 'GET',
-                    headers: request.raw.headers,
+                    headers: rawRequest.headers,
                     signal: controller.signal
                 });
                 const routerContext = {
@@ -169,7 +170,7 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                     history,
                     basepath: '/',
                     rewrite,
-                    origin: new URL(request.raw.url).origin,
+                    origin: new URL(rawRequest.url).origin,
                     ssr: {
                         nonce
                     },
@@ -198,14 +199,14 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                 }
                 const routerErrors = collectRouterErrors(tanstackRouter);
                 if (routerErrors && 'clientRender' === loaderFailureMode) {
-                    context.ssrContext?.response.status(200);
+                    context.ssrContext?.response?.status(200);
                     try {
                         serverRouter.serverSsr?.cleanup?.();
                     } catch  {}
                     throw Object.values(routerErrors)[0];
                 }
                 await preloadMatchedRouteComponents(serverRouter);
-                context.ssrContext?.response.status(tanstackRouter.state.statusCode);
+                context.ssrContext?.response?.status(tanstackRouter.state.statusCode);
                 await serverRouter.serverSsr?.dehydrate?.();
                 if (isRSCNavigation) {
                     await waitForRouterSerialization(serverRouter);

package/dist/esm-node/runtime/prefetchLink.mjs

@@ -1,6 +1,6 @@
 import "node:module";
 import { jsx } from "react/jsx-runtime";
-import { Link } from "@tanstack/react-router";
+import { useLinkProps } from "@tanstack/react-router";
 function resolvePreloadFromPrefetch(prefetch, preload) {
     if (void 0 !== preload) return preload;
     if ('none' === prefetch) return false;
@@ -8,12 +8,25 @@ function resolvePreloadFromPrefetch(prefetch, preload) {
     return 'viewport';
 }
 const LinkComponentImpl = (props)=>{
-    const { prefetch, preload, ...rest } = props;
-    return /*#__PURE__*/ jsx(Link, {
+    const { prefetch, preload, 'aria-current': ariaCurrentProp, ref, children, ...rest } = props;
+    const hasAriaCurrentOverride = 'aria-current' in props;
+    const linkOptions = {
         ...rest,
         preload: resolvePreloadFromPrefetch(prefetch, preload)
+    };
+    const linkProps = useLinkProps(linkOptions, ref);
+    const { disabled: _disabled, type: _type, ...anchorProps } = linkProps;
+    if (hasAriaCurrentOverride) if (false === ariaCurrentProp || void 0 === ariaCurrentProp) delete anchorProps['aria-current'];
+    else anchorProps['aria-current'] = ariaCurrentProp;
+    const resolvedChildren = 'function' == typeof children ? children({
+        isActive: 'active' === anchorProps['data-status'],
+        isTransitioning: 'transitioning' === anchorProps['data-transitioning']
+    }) : children;
+    return /*#__PURE__*/ jsx("a", {
+        ...anchorProps,
+        children: resolvedChildren
     });
 };
-const prefetchLink_Link = LinkComponentImpl;
+const Link = LinkComponentImpl;
 const NavLink = LinkComponentImpl;
-export { NavLink, prefetchLink_Link as Link };
+export { Link, NavLink };

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

@@ -30,4 +30,15 @@ export declare function writeTanstackRouterTypesForEntries(opts: {
     i18nPluginInstalled?: boolean;
 }): Promise<void>;
 export declare function tanstackRouterPlugin(options?: TanstackRouterPluginOptions): CliPlugin<AppTools>;
+/**
+ * Headless regeneration of `router.gen.ts` / `register.gen.d.ts` for a generated
+ * app, without running a full dev/build. Drives the app-tools analyze `onPrepare`
+ * (which fires `generateEntryCode`) and returns before any bundling — the app's
+ * own registered plugin-tanstack writes the artifacts via its `generateEntryCode`
+ * subscriber. Reuses the exact hook dev/build use, so there is no scanning drift.
+ */
+export declare function generateTanstackRouteArtifacts(opts: {
+    appDirectory: string;
+    version?: string;
+}): Promise<void>;
 export default tanstackRouterPlugin;

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.3",
+  "version": "3.5.0-ultramodern.30",
   "engines": {
     "node": ">=20"
   },
@@ -77,13 +77,14 @@
     "@swc/helpers": "^0.5.23",
     "@tanstack/react-router": "1.170.16",
     "@tanstack/router-core": "1.171.13",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.5.0-ultramodern.3",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.3",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.3",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.5.0-ultramodern.3"
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.5.0-ultramodern.30",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.5.0-ultramodern.30",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.30",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.30"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "3.5.0-ultramodern.3",
+    "@modern-js/app-tools": "3.5.0-ultramodern.30",
+    "@modern-js/runtime": "3.5.0-ultramodern.30",
     "react": "^19.2.7",
     "react-dom": "^19.2.7"
   },
@@ -98,8 +99,8 @@
     "@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.3",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.5.0-ultramodern.3",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.5.0-ultramodern.30",
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.5.0-ultramodern.30",
     "@scripts/rstest-config": "2.66.0"
   },
   "sideEffects": [

package/rstest.config.mts

@@ -25,6 +25,7 @@ export default {
       include: [
         'tests/router/cli.test.ts',
         'tests/router/fastDefaults.test.ts',
+        'tests/router/generateRouteArtifacts.test.ts',
         'tests/router/hooks.test.ts',
         'tests/router/loaderBridge.test.ts',
         'tests/router/packageSurface.test.ts',
@@ -44,6 +45,7 @@ export default {
         'tests/router/dataMutation.test.tsx',
         'tests/router/hydrationBoundary.test.tsx',
         'tests/router/prefetchLink.test.tsx',
+        'tests/router/prefetchLinkPreload.test.tsx',
       ],
       extends: commonConfig,
     }),

package/src/cli/index.ts

@@ -1,4 +1,4 @@
-// @effect-diagnostics asyncFunction:off nodeBuiltinImport:off strictBooleanExpressions:off
+// @effect-diagnostics asyncFunction:off nodeBuiltinImport:off strictBooleanExpressions:off processEnv:off processEnvInEffect:off
 import path from 'node:path';
 import type {
   AppNormalizedConfig,
@@ -518,4 +518,66 @@ export function tanstackRouterPlugin(
   };
 }
 
+/**
+ * Headless regeneration of `router.gen.ts` / `register.gen.d.ts` for a generated
+ * app, without running a full dev/build. Drives the app-tools analyze `onPrepare`
+ * (which fires `generateEntryCode`) and returns before any bundling — the app's
+ * own registered plugin-tanstack writes the artifacts via its `generateEntryCode`
+ * subscriber. Reuses the exact hook dev/build use, so there is no scanning drift.
+ */
+export async function generateTanstackRouteArtifacts(opts: {
+  appDirectory: string;
+  version?: string;
+}): Promise<void> {
+  const [{ createRunOptions }, { cli }, utils] = await Promise.all([
+    import('@modern-js/app-tools/cli/run'),
+    import('@modern-js/plugin/cli'),
+    import('@modern-js/utils'),
+  ]);
+  // Load-bearing, not decoration: app-tools' analyze.onPrepare only fires
+  // generateEntryCode (the hook that writes the route artifacts) when
+  // checkIsBuildCommands() is true, and getCommand() resolves the command
+  // from MODERN_ARGV before process.argv — cli.init's `command` option does
+  // not feed that check.
+  process.env.MODERN_ARGV = 'node modern build';
+  process.env.NODE_ENV = process.env.NODE_ENV || 'production';
+
+  // Resolve the app's Modern.js config file ourselves and pass it as an
+  // absolute base path. `createRunOptions` otherwise defaults its config lookup
+  // to `process.cwd()` (not `cwd`/appDirectory), so headless invocations that
+  // run from a different directory than the app — e.g. the create CLI spawning
+  // this from the workspace root — find no config, and `findExists` returns
+  // `false`. That `false` then flows into `cli.init` -> `getConfigFilePath` ->
+  // `path.isAbsolute(false)`, throwing the opaque
+  // `The "path" argument must be of type string. Received type boolean (false)`.
+  // Passing an absolute base is resolution-based: cwd no longer matters, and the
+  // downstream `getConfigFile` still appends the correct extension.
+  const { findExists, CONFIG_FILE_EXTENSIONS } = utils as {
+    findExists: (paths: string[]) => string | false;
+    CONFIG_FILE_EXTENSIONS: string[];
+  };
+  const configFileBase = path.resolve(opts.appDirectory, 'modern.config');
+  const resolvedConfigFile = findExists(
+    CONFIG_FILE_EXTENSIONS.map(extension => `${configFileBase}${extension}`),
+  );
+  if (!resolvedConfigFile) {
+    throw new Error(
+      `[plugin-tanstack] Unable to locate a Modern.js config file (modern.config.{${CONFIG_FILE_EXTENSIONS.map(
+        extension => extension.slice(1),
+      ).join(',')}}) in ${opts.appDirectory}. ` +
+        'TanStack route generation requires the app config to resolve its plugins.',
+    );
+  }
+
+  const runOptions = await createRunOptions({
+    cwd: opts.appDirectory,
+    configFile: configFileBase,
+    version:
+      opts.version || process.env.MODERN_JS_VERSION || '0.0.0-routes-generate',
+    internalPlugins: (utils as { INTERNAL_RUNTIME_PLUGINS: unknown })
+      .INTERNAL_RUNTIME_PLUGINS as never,
+  });
+  await cli.init({ ...runOptions, command: 'build' });
+}
+
 export default tanstackRouterPlugin;