@bleedingdev/modern-js-plugin-tanstack 3.2.0-ultramodern.12 → 3.2.0-ultramodern.120

package/src/runtime/plugin.tsx

@@ -24,8 +24,7 @@ import {
   useNavigate,
   useRouter,
 } from '@tanstack/react-router';
-import { RouterClient } from '@tanstack/react-router/ssr/client';
-import * as React from 'react';
+import { hydrate as hydrateTanstackRouter } from '@tanstack/react-router/ssr/client';
 import { useContext, useMemo } from 'react';
 import { createModernBasepathRewrite } from './basepathRewrite';
 import {
@@ -37,13 +36,19 @@ import {
   onBeforeHydrateRouter as onBeforeHydrateRouterHook,
   type RouterExtendsHooks,
 } from './hooks';
+import { wrapTanstackSsrHydrationBoundary } from './hydrationBoundary';
 import {
   applyRouterRuntimeState,
   type RouterLifecycleContext,
 } from './lifecycle';
+import { withModernRouteMatchContext } from './outlet';
+import { Link } from './prefetchLink';
 import { createRouteTreeFromRouteObjects } from './routeTree';
 import { getTanstackRscSerializationAdapters } from './rsc/client';
-import type { RouterConfig } from './types';
+import {
+  getModernTanstackRouterFastDefaults,
+  type RouterConfig,
+} from './types';
 import { createRouteObjectsFromConfig, urlJoin } from './utils';
 
 const BLOCKING_SUBSCRIBE_SYMBOL = Symbol.for(
@@ -52,7 +57,6 @@ const BLOCKING_SUBSCRIBE_SYMBOL = Symbol.for(
 const BLOCKING_STATE_SYMBOL = Symbol.for(
   '@modern-js/plugin-tanstack:blocking-state',
 );
-
 type TanstackRouterWithSubscribe = {
   [BLOCKING_STATE_SYMBOL]?: () => boolean;
   [BLOCKING_SUBSCRIBE_SYMBOL]?: boolean;
@@ -66,6 +70,30 @@ type WindowWithTanstackSsr = Window & {
   $_TSR?: unknown;
 };
 
+type RouteComponentPreloadable = {
+  load?: () => Promise<unknown>;
+  preload?: () => Promise<unknown>;
+};
+
+type ModernRouteModule = {
+  Component?: unknown;
+  default?: unknown;
+};
+
+type RouterWithPreloadableRoutes = AnyRouter & {
+  routesById?: Record<
+    string,
+    {
+      options?: {
+        component?: unknown;
+        staticData?: {
+          modernRouteId?: string;
+        };
+      };
+    }
+  >;
+};
+
 type TanstackRouterRuntimeConfig = {
   plugins?: TanstackRouterRuntimePlugin[];
   router?: Partial<RouterConfig>;
@@ -129,6 +157,151 @@ function wrapRouterSubscribeWithBlockState(
   target[BLOCKING_SUBSCRIBE_SYMBOL] = true;
 }
 
+type RouterHydrationRecord = {
+  error?: unknown;
+  promise: Promise<unknown>;
+  status: 'pending' | 'fulfilled' | 'rejected';
+};
+
+const routerHydrationRecords = new WeakMap<AnyRouter, RouterHydrationRecord>();
+const routeModulesKey = '_routeModules';
+
+function pickRouteModuleComponent(
+  routeModule: unknown,
+  seen: Set<unknown> = new Set(),
+): unknown {
+  if (
+    typeof routeModule === 'function' ||
+    (routeModule &&
+      typeof routeModule === 'object' &&
+      '$$typeof' in routeModule)
+  ) {
+    return routeModule;
+  }
+
+  if (!routeModule || typeof routeModule !== 'object') {
+    return undefined;
+  }
+  if (seen.has(routeModule)) {
+    return undefined;
+  }
+  seen.add(routeModule);
+
+  const module = routeModule as ModernRouteModule;
+  for (const candidate of [module.default, module.Component]) {
+    const component = pickRouteModuleComponent(candidate, seen);
+    if (component) {
+      return component;
+    }
+  }
+
+  return undefined;
+}
+
+function getCachedRouteModule(routeId: string) {
+  if (typeof window === 'undefined') {
+    return undefined;
+  }
+
+  return (window as unknown as Record<string, Record<string, unknown>>)[
+    routeModulesKey
+  ]?.[routeId];
+}
+
+function preloadHydratedRouteComponents(router: AnyRouter): Promise<void> {
+  const preloadableRouter = router as RouterWithPreloadableRoutes;
+  const routesById = preloadableRouter.routesById || {};
+  const matches = preloadableRouter.stores.matches.get() as Array<{
+    routeId?: string;
+  }>;
+
+  return Promise.all(
+    matches.map(match => {
+      if (match.routeId === undefined || match.routeId === '') {
+        return undefined;
+      }
+
+      const route = routesById[match.routeId];
+      const component = route?.options?.component as RouteComponentPreloadable;
+      const preload = component?.load || component?.preload;
+      if (typeof preload !== 'function') {
+        return undefined;
+      }
+
+      return Promise.resolve(preload.call(component)).then(routeModule => {
+        const modernRouteId = route?.options?.staticData?.modernRouteId;
+        const cachedRouteModule =
+          typeof modernRouteId === 'string' && modernRouteId !== ''
+            ? getCachedRouteModule(modernRouteId)
+            : undefined;
+        const resolvedComponent = pickRouteModuleComponent(
+          cachedRouteModule ?? routeModule,
+        );
+        if (
+          resolvedComponent !== undefined &&
+          typeof modernRouteId === 'string' &&
+          modernRouteId !== ''
+        ) {
+          route.options.component = withModernRouteMatchContext(
+            resolvedComponent,
+            modernRouteId,
+          );
+        }
+      });
+    }),
+  ).then(() => undefined);
+}
+
+function getTanstackSsrHydrationRecord(router: AnyRouter) {
+  const existingHydrationRecord = routerHydrationRecords.get(router);
+  if (existingHydrationRecord !== undefined) {
+    return existingHydrationRecord;
+  }
+
+  const hydrationRecord: RouterHydrationRecord = {
+    promise: Promise.resolve(),
+    status: 'pending',
+  };
+  routerHydrationRecords.set(router, hydrationRecord);
+  try {
+    hydrationRecord.promise = hydrateTanstackRouter(router)
+      .then(value => preloadHydratedRouteComponents(router).then(() => value))
+      .then(
+        value => {
+          hydrationRecord.status = 'fulfilled';
+          return value;
+        },
+        error => {
+          hydrationRecord.status = 'rejected';
+          hydrationRecord.error = error;
+          throw error;
+        },
+      );
+  } catch (error) {
+    hydrationRecord.status = 'rejected';
+    hydrationRecord.error = error;
+    hydrationRecord.promise = Promise.reject(error);
+    hydrationRecord.promise.catch(() => {});
+  }
+  return hydrationRecord;
+}
+
+function getTanstackSsrHydrationPromise(router: AnyRouter) {
+  return getTanstackSsrHydrationRecord(router).promise;
+}
+
+function hasTanstackSsrHydrationRecord(router: AnyRouter) {
+  return routerHydrationRecords.has(router);
+}
+
+function ModernRouterClient({ router }: { router: AnyRouter }) {
+  const hydrationRecord = getTanstackSsrHydrationRecord(router);
+  if (hydrationRecord.status === 'rejected') {
+    throw hydrationRecord.error;
+  }
+  return <RouterProvider router={router} />;
+}
+
 function stripSyntheticNotFoundRoute(routes: RouteObject[]): RouteObject[] {
   return routes
     .filter(route => !(route.path === '*' && !route.id && !route.loader))
@@ -157,26 +330,168 @@ export const tanstackRouterPlugin = (
       onBeforeHydrateRouter: onBeforeHydrateRouterHook,
     },
     setup: (api: TanstackRouterPluginAPI) => {
-      api.onBeforeRender(context => {
+      const hooks = api.getHooks();
+      let cachedRouteObjects: RouteObject[] | undefined;
+      let cachedRouteTree: ReturnType<
+        typeof createRouteTreeFromRouteObjects
+      > | null = null;
+      let cachedRouter: AnyRouter | null = null;
+      let cachedRouterBasepath: string | null = null;
+
+      const getMergedConfig = () => {
         const pluginConfig = api.getRuntimeConfig() as {
           router?: Partial<RouterConfig>;
         };
-        const mergedConfig = merge(
-          pluginConfig.router || {},
-          userConfig,
-        ) as RouterConfig;
+        return merge(pluginConfig.router || {}, userConfig) as RouterConfig;
+      };
+
+      const getRouteObjects = () => {
+        if (typeof cachedRouteObjects !== 'undefined') {
+          return cachedRouteObjects;
+        }
+
+        const mergedConfig = getMergedConfig();
+        const { routesConfig, createRoutes } = mergedConfig;
+        const finalRouteConfig = {
+          routes: getGlobalRoutes(),
+          globalApp: getGlobalLayoutApp(),
+          ...routesConfig,
+        };
+
+        const routeObjects = createRoutes
+          ? createRoutes()
+          : createRouteObjectsFromConfig({
+              routesConfig: finalRouteConfig,
+            }) || [];
+
+        const normalizedRouteObjects = createRoutes
+          ? routeObjects
+          : stripSyntheticNotFoundRoute(routeObjects);
+
+        cachedRouteObjects = hooks.modifyRoutes.call(
+          normalizedRouteObjects,
+        ) as RouteObject[];
+        return cachedRouteObjects;
+      };
+
+      const getRouteTree = () => {
+        if (cachedRouteTree) {
+          return cachedRouteTree;
+        }
+
+        const routeObjects = getRouteObjects();
+        if (!routeObjects.length) {
+          return null;
+        }
+
+        cachedRouteTree = createRouteTreeFromRouteObjects(routeObjects, {
+          rscPayloadRouter: getGlobalEnableRsc(),
+        });
+        return cachedRouteTree;
+      };
+
+      const selectBasePath = (pathname: string) => {
+        const { serverBase = [] } = getMergedConfig();
+        const match = serverBase.find(baseUrl =>
+          isSegmentPrefix(pathname, baseUrl),
+        );
+        return match || '/';
+      };
+
+      const getClientBasename = (runtimeContext: TInternalRuntimeContext) => {
+        const { basename = '' } = getMergedConfig();
+        const baseUrl = selectBasePath(location.pathname).replace(/^\/*/, '/');
+        return baseUrl === '/'
+          ? urlJoin(
+              baseUrl,
+              runtimeContext._internalRouterBaseName || basename || '',
+            )
+          : baseUrl;
+      };
+
+      const getRouter = (
+        runtimeContext: TInternalRuntimeContext,
+        _basename: string,
+      ) => {
+        const routeTree = getRouteTree();
+        if (!routeTree) {
+          return null;
+        }
+
+        const lifecycleContext: RouterLifecycleContext = {
+          framework: 'tanstack',
+          phase: 'client-create',
+          routes: getRouteObjects(),
+          runtimeContext,
+          basename: _basename,
+        };
+        hooks.onBeforeCreateRouter.call(lifecycleContext);
+
+        if (cachedRouter && cachedRouterBasepath === _basename) {
+          wrapRouterSubscribeWithBlockState(
+            cachedRouter,
+            runtimeContext.unstable_getBlockNavState,
+          );
+          hooks.onAfterCreateRouter.call({
+            ...lifecycleContext,
+            router: cachedRouter,
+            runtimeContext,
+          });
+          return cachedRouter;
+        }
+
+        const mergedConfig = getMergedConfig();
+        const { supportHtml5History = true } = mergedConfig;
+        const history = supportHtml5History
+          ? createBrowserHistory()
+          : createHashHistory();
+        const rewrite = createModernBasepathRewrite(_basename);
+        const serializationAdapters = getGlobalEnableRsc()
+          ? getTanstackRscSerializationAdapters()
+          : undefined;
+
+        cachedRouter = createRouter({
+          ...getModernTanstackRouterFastDefaults(mergedConfig),
+          routeTree,
+          basepath: '/',
+          rewrite,
+          history,
+          context: {},
+          ...(serializationAdapters ? { serializationAdapters } : {}),
+        });
+        cachedRouterBasepath = _basename;
+        wrapRouterSubscribeWithBlockState(
+          cachedRouter,
+          runtimeContext.unstable_getBlockNavState,
+        );
+        hooks.onAfterCreateRouter.call({
+          ...lifecycleContext,
+          router: cachedRouter,
+          runtimeContext,
+        });
+
+        return cachedRouter;
+      };
+
+      api.onBeforeRender(context => {
+        const mergedConfig = getMergedConfig();
         if (
           typeof window !== 'undefined' &&
-          (window as { _SSR_DATA?: unknown })._SSR_DATA &&
+          (window as { _SSR_DATA?: unknown })._SSR_DATA !== undefined &&
           mergedConfig.unstable_reloadOnURLMismatch
         ) {
           const { ssrContext } = context;
           const currentPathname = normalizePathname(window.location.pathname);
           const initialPathname =
-            ssrContext?.request?.pathname &&
-            normalizePathname(ssrContext.request.pathname);
+            typeof ssrContext?.request?.pathname === 'string'
+              ? normalizePathname(ssrContext.request.pathname)
+              : undefined;
 
-          if (initialPathname && initialPathname !== currentPathname) {
+          if (
+            initialPathname !== undefined &&
+            initialPathname !== '' &&
+            initialPathname !== currentPathname
+          ) {
             const errorMsg = `The initial URL ${initialPathname} and the URL ${currentPathname} to be hydrated do not match, reload.`;
             console.error(errorMsg);
             window.location.reload();
@@ -184,163 +499,55 @@ export const tanstackRouterPlugin = (
         }
 
         context.router = {
+          Link,
           useMatches,
           useLocation,
           useNavigate,
           useRouter,
         };
-      });
 
-      api.wrapRoot(App => {
-        const mergedConfig = merge(
-          api.getRuntimeConfig().router || {},
-          userConfig,
-        ) as RouterConfig;
-
-        const {
-          serverBase = [],
-          supportHtml5History = true,
-          basename = '',
-          routesConfig,
-          createRoutes,
-        } = mergedConfig;
+        const hasSSRBootstrap =
+          typeof window !== 'undefined' &&
+          Boolean((window as WindowWithTanstackSsr).$_TSR);
+        if (hasSSRBootstrap && getRouteObjects().length > 0) {
+          const runtimeContext = context as TInternalRuntimeContext;
+          const router = getRouter(
+            runtimeContext,
+            getClientBasename(runtimeContext),
+          );
+          if (router !== undefined && router !== null) {
+            return getTanstackSsrHydrationPromise(router).then(() => undefined);
+          }
+        }
 
-        const finalRouteConfig = {
-          routes: getGlobalRoutes(),
-          globalApp: getGlobalLayoutApp(),
-          ...routesConfig,
-        };
+        return;
+      });
 
-        if (!finalRouteConfig.routes && !createRoutes) {
+      api.wrapRoot(App => {
+        if (getRouteObjects().length === 0) {
           return App;
         }
 
-        const hooks = api.getHooks();
-
-        let cachedRouteObjects: RouteObject[] | undefined;
-
-        const getRouteObjects = () => {
-          if (typeof cachedRouteObjects !== 'undefined') {
-            return cachedRouteObjects;
-          }
-
-          const routeObjects = createRoutes
-            ? createRoutes()
-            : createRouteObjectsFromConfig({
-                routesConfig: finalRouteConfig,
-              }) || [];
-
-          const normalizedRouteObjects = createRoutes
-            ? routeObjects
-            : stripSyntheticNotFoundRoute(routeObjects);
-
-          cachedRouteObjects = hooks.modifyRoutes.call(
-            normalizedRouteObjects,
-          ) as RouteObject[];
-          return cachedRouteObjects;
-        };
-
-        const selectBasePath = (pathname: string) => {
-          const match = serverBase.find(baseUrl =>
-            isSegmentPrefix(pathname, baseUrl),
-          );
-          return match || '/';
-        };
-
-        let cachedRouteTree: ReturnType<
-          typeof createRouteTreeFromRouteObjects
-        > | null = null;
-        let cachedRouter: AnyRouter | null = null;
-        let cachedRouterBasepath: string | null = null;
-
         const RouterWrapper = () => {
           const runtimeContext = useContext(
             InternalRuntimeContext,
           ) as TInternalRuntimeContext;
 
-          const baseUrl = selectBasePath(location.pathname).replace(
-            /^\/*/,
-            '/',
-          );
-          const _basename =
-            baseUrl === '/'
-              ? urlJoin(
-                  baseUrl,
-                  runtimeContext._internalRouterBaseName || basename || '',
-                )
-              : baseUrl;
-
-          const routeTree = useMemo(() => {
-            if (cachedRouteTree) {
-              return cachedRouteTree;
-            }
-            const routeObjects = getRouteObjects();
-            if (!routeObjects.length) {
-              return null;
-            }
-            cachedRouteTree = createRouteTreeFromRouteObjects(routeObjects, {
-              rscPayloadRouter: getGlobalEnableRsc(),
-            });
-            return cachedRouteTree;
-          }, []);
+          const _basename = getClientBasename(runtimeContext);
+
+          const routeTree = useMemo(() => getRouteTree(), []);
 
           if (!routeTree) {
             return App ? <App /> : null;
           }
 
-          const router = useMemo(() => {
-            const lifecycleContext: RouterLifecycleContext = {
-              framework: 'tanstack',
-              phase: 'client-create',
-              routes: getRouteObjects(),
-              runtimeContext,
-              basename: _basename,
-            };
-            hooks.onBeforeCreateRouter.call(lifecycleContext);
-
-            if (cachedRouter && cachedRouterBasepath === _basename) {
-              wrapRouterSubscribeWithBlockState(
-                cachedRouter,
-                runtimeContext.unstable_getBlockNavState,
-              );
-              hooks.onAfterCreateRouter.call({
-                ...lifecycleContext,
-                router: cachedRouter,
-                runtimeContext,
-              });
-              return cachedRouter;
-            }
-
-            const history = supportHtml5History
-              ? createBrowserHistory()
-              : createHashHistory();
-
-            const rewrite = createModernBasepathRewrite(_basename);
-            const serializationAdapters = getGlobalEnableRsc()
-              ? getTanstackRscSerializationAdapters()
-              : undefined;
-
-            cachedRouter = createRouter({
-              routeTree,
-              basepath: '/',
-              rewrite,
-              history,
-              context: {},
-              ...(serializationAdapters ? { serializationAdapters } : {}),
-            });
-            cachedRouterBasepath = _basename;
-            wrapRouterSubscribeWithBlockState(
-              cachedRouter,
-              runtimeContext.unstable_getBlockNavState,
-            );
-            hooks.onAfterCreateRouter.call({
-              ...lifecycleContext,
-              router: cachedRouter,
-              runtimeContext,
-            });
-
-            return cachedRouter;
-          }, [_basename, routeTree, supportHtml5History, runtimeContext]);
+          const router = useMemo(
+            () => getRouter(runtimeContext, _basename),
+            [_basename, routeTree, runtimeContext],
+          );
+          if (!router) {
+            return App ? <App /> : null;
+          }
           const runtimeState = applyRouterRuntimeState(runtimeContext, {
             framework: 'tanstack',
             basename: _basename,
@@ -357,8 +564,10 @@ export const tanstackRouterPlugin = (
 
           const hasSSRBootstrap =
             typeof window !== 'undefined' &&
-            Boolean((window as WindowWithTanstackSsr).$_TSR);
-          if (hasSSRBootstrap) {
+            (Boolean((window as WindowWithTanstackSsr).$_TSR) ||
+              hasTanstackSsrHydrationRecord(router));
+          const needsRouterClient = hasSSRBootstrap;
+          if (needsRouterClient) {
             hooks.onBeforeHydrateRouter.call({
               ...lifecycleContext,
               phase: 'hydrate',
@@ -367,14 +576,16 @@ export const tanstackRouterPlugin = (
             });
           }
 
-          const RouterContent = hasSSRBootstrap ? (
-            <React.Suspense fallback={null}>
-              <RouterClient router={router} />
-            </React.Suspense>
+          const RouterContent = needsRouterClient ? (
+            <ModernRouterClient router={router} />
           ) : (
             <RouterProvider router={router} />
           );
-          if (hasSSRBootstrap) {
+          const HydratableRouterContent = wrapTanstackSsrHydrationBoundary(
+            RouterContent,
+            hasSSRBootstrap,
+          );
+          if (needsRouterClient) {
             hooks.onAfterHydrateRouter.call({
               ...lifecycleContext,
               phase: 'hydrate',
@@ -383,7 +594,11 @@ export const tanstackRouterPlugin = (
             });
           }
 
-          return App ? <App>{RouterContent}</App> : RouterContent;
+          return App ? (
+            <App>{HydratableRouterContent}</App>
+          ) : (
+            HydratableRouterContent
+          );
         };
 
         return RouterWrapper;

package/src/runtime/plugin.worker.tsx

@@ -0,0 +1,4 @@
+export {
+  default,
+  tanstackRouterPlugin,
+} from './plugin.node';

package/src/runtime/prefetchLink.tsx

@@ -28,7 +28,7 @@ function resolvePreloadFromPrefetch(
     return prefetch;
   }
 
-  return preload;
+  return 'viewport';
 }
 
 export type LinkProps<