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

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/cli/tanstackTypes/source.ts

@@ -5,6 +5,7 @@ import type {
   AppTools,
   AppToolsContext,
 } from '@modern-js/app-tools';
+import { canonicaliseLocalisedRoutes } from '@modern-js/i18n-runtime-extensions';
 import { makeLegalIdentifier } from '@modern-js/runtime/cli';
 import type { NestedRouteForCli, PageRoute } from '@modern-js/types';
 import { upath as path } from '@modern-js/utils';
@@ -45,8 +46,9 @@ export async function generateTanstackRouterTypesSourceForEntry(opts: {
     appContext,
     entryName,
     generatedDirName = 'modern-tanstack',
-    routes,
+    routes: rawRoutes,
   } = opts;
+  const routes: RouteForCli[] = canonicaliseLocalisedRoutes(rawRoutes);
   const outDir = path.join(
     appContext.srcDirectory,
     generatedDirName,

package/src/runtime/basepathRewrite.ts

@@ -1,4 +1,8 @@
 // @effect-diagnostics strictBooleanExpressions:off
+import { createLocalisedRouteRewrite } from '@modern-js/i18n-runtime-extensions';
+import type { RouteObject } from '@modern-js/runtime-utils/router';
+import { composeRewrites } from '@tanstack/react-router';
+
 function normalizeBasepath(basepath: string): string {
   if (!basepath) {
     return '/';
@@ -15,10 +19,12 @@ function normalizeBasepath(basepath: string): string {
 export function createModernBasepathRewrite(
   basepath: string,
   caseSensitive = false,
+  routes: RouteObject[] = [],
 ) {
+  const localisedRewrite = createLocalisedRouteRewrite(routes);
   const normalizedBasepath = normalizeBasepath(basepath);
   if (normalizedBasepath === '/') {
-    return undefined;
+    return localisedRewrite;
   }
 
   const normalizedBasepathWithSlash = `${normalizedBasepath}/`;
@@ -29,7 +35,7 @@ export function createModernBasepathRewrite(
     ? normalizedBasepathWithSlash
     : normalizedBasepathWithSlash.toLowerCase();
 
-  return {
+  const basepathRewrite = {
     input: ({ url }: { url: URL }) => {
       const pathname = caseSensitive
         ? url.pathname
@@ -57,4 +63,7 @@ export function createModernBasepathRewrite(
       return url;
     },
   };
+  return localisedRewrite
+    ? composeRewrites([basepathRewrite, localisedRewrite])
+    : basepathRewrite;
 }

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,
@@ -35,6 +35,7 @@ import {
   type TanstackRouterPluginAPI,
   type TanstackRouterRuntimePlugin,
 } from './pluginShared';
+import { Link } from './prefetchLink';
 import {
   createRouteTreeFromRouteObjects,
   getModernRouteIdsFromMatches,
@@ -98,6 +99,8 @@ export const tanstackRouterPlugin = (
           return;
         }
 
+        context.router = { Link };
+
         const {
           request,
           nonce,
@@ -134,7 +137,11 @@ export const tanstackRouterPlugin = (
           initialEntries: [initialHref],
         });
 
-        const rewrite = createModernBasepathRewrite(_basename);
+        const rewrite = createModernBasepathRewrite(
+          _basename,
+          false,
+          modifiedRouteObjects,
+        );
         const routerLifecycleContext: RouterLifecycleContext = {
           framework: 'tanstack',
           phase: 'ssr-prepare',

package/src/runtime/plugin.tsx

@@ -149,7 +149,11 @@ export const tanstackRouterPlugin = (
         const history = supportHtml5History
           ? createBrowserHistory()
           : createHashHistory();
-        const rewrite = createModernBasepathRewrite(_basename);
+        const rewrite = createModernBasepathRewrite(
+          _basename,
+          false,
+          getRouteObjects(),
+        );
         const serializationAdapters = getGlobalEnableRsc()
           ? getTanstackRscSerializationAdapters()
           : undefined;

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);

package/src/runtime/routeTree/construction.ts

@@ -1,5 +1,6 @@
 // @effect-diagnostics asyncFunction:off strictBooleanExpressions:off
 
+import { canonicaliseLocalisedRoutes } from '@modern-js/i18n-runtime-extensions';
 import { DefaultNotFound } from '@modern-js/runtime/context';
 import type { RouteObject } from '@modern-js/runtime-utils/router';
 import type { AnyRoute, AnyRouter } from '@tanstack/react-router';
@@ -121,6 +122,7 @@ export function createRouteTreeFromRouteObjects(
   routes: RouteObject[],
   options: RouteTreeOptions = {},
 ): ModernTanstackRootRoute {
+  routes = canonicaliseLocalisedRoutes(routes);
   const rootLikeRoute = getRootLikeRouteObject(routes) as
     | ModernRouteObject
     | undefined;

package/src/runtime/router.ts

@@ -1,43 +1,28 @@
-/**
- * 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';
+/** App-local composition for custom entries using runtime router selection. */
+import { routerProviderRegistryHooks } from '@modern-js/runtime/context';
+import { routerPlugin as nativeRouterPlugin } 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';
 
-type LegacyRouterPlugin = (typeof runtimeRouter)['routerPlugin'];
-type CurrentRouterPluginCreator = (
-  localProviders: readonly {
-    name: string;
-    factory: typeof tanstackRouterProviderFactory;
-  }[],
-) => LegacyRouterPlugin;
+const createProviderPlugin = createRouterPlugin({
+  defaultProvider: { name: 'react-router', factory: nativeRouterPlugin },
+  registryHooks: routerProviderRegistryHooks,
+  localProviders: [
+    { name: 'tanstack', factory: tanstackRouterProviderFactory },
+  ],
+});
+const statePlugin = createRouterStatePlugin({
+  registryHooks: routerProviderRegistryHooks,
+});
 
-function getRouterPlugin(): LegacyRouterPlugin {
-  const createRouterPlugin = Reflect.get(runtimeRouter, 'createRouterPlugin') as
-    | CurrentRouterPluginCreator
-    | undefined;
-
-  if (typeof createRouterPlugin === 'function') {
-    return createRouterPlugin([
-      { name: 'tanstack', factory: tanstackRouterProviderFactory },
-    ]);
-  }
-
-  const legacyRouterPlugin = Reflect.get(runtimeRouter, 'routerPlugin');
-
-  if (typeof legacyRouterPlugin === 'function') {
-    return tanstackRouterProviderFactory as unknown as LegacyRouterPlugin;
-  }
-
-  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.',
-  );
-}
-
-export const routerPlugin: LegacyRouterPlugin = getRouterPlugin();
+export const routerPlugin: typeof nativeRouterPlugin = (userConfig = {}) => {
+  const providerPlugin = createProviderPlugin(userConfig);
+  return {
+    ...providerPlugin,
+    setup(api) {
+      statePlugin.setup(api);
+      providerPlugin.setup(api);
+    },
+  };
+};

package/src/runtime/state.ts

@@ -1,7 +1,7 @@
 import {
   getRouterRuntimeState,
   type InternalRouterRuntimeState,
-} from '@modern-js/runtime/context';
+} from '@modern-js/runtime-extensions/router-state';
 import type { AnyRouter } from '@tanstack/react-router';
 
 /**

package/src/runtime/types.ts

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

package/src/runtime/utils.tsx

@@ -54,6 +54,7 @@ function toTanstackRouteObject(
 ): RouteObject | null {
   if (route.type === 'nested') {
     return {
+      modernLocalisedRoute: Reflect.get(route, 'modernLocalisedRoute'),
       path: route.path,
       id: route.id,
       loader: route.loader,
@@ -91,9 +92,10 @@ function toTanstackRouteObject(
     globalApp,
   );
   return {
+    modernLocalisedRoute: Reflect.get(route, 'modernLocalisedRoute'),
     path: route.path,
     element: React.createElement(LayoutComponent),
-  };
+  } as ModernRouteObject;
 }
 
 export function createTanstackRouteObjectsFromConfig({