@bleedingdev/modern-js-plugin-tanstack 3.2.0-ultramodern.81 → 3.2.0-ultramodern.83

package/dist/cjs/runtime/routeTree.js

@@ -85,12 +85,19 @@ function normalizeModernLoaderResponse(result) {
     }
     return normalizeModernLoaderResult(result);
 }
-function pickRouteModuleComponent(routeModule) {
+function pickRouteModuleComponent(routeModule, seen = new Set()) {
     if ('function' == typeof routeModule || routeModule && 'object' == typeof routeModule && '$$typeof' in routeModule) return routeModule;
     if (!routeModule || 'object' != typeof routeModule) return;
+    if (seen.has(routeModule)) return;
+    seen.add(routeModule);
     const module = routeModule;
-    const component = module.default || module.Component;
-    if ('function' == typeof component || component && 'object' == typeof component && '$$typeof' in component) return component;
+    for (const candidate of [
+        module.default,
+        module.Component
+    ]){
+        const component = pickRouteModuleComponent(candidate, seen);
+        if (component) return component;
+    }
 }
 function createServerLazyImportComponent(lazyImport, fallbackComponent) {
     if ("u" > typeof document) return fallbackComponent;

package/dist/esm/runtime/routeTree.mjs

@@ -55,12 +55,19 @@ function normalizeModernLoaderResponse(result) {
     }
     return normalizeModernLoaderResult(result);
 }
-function pickRouteModuleComponent(routeModule) {
+function pickRouteModuleComponent(routeModule, seen = new Set()) {
     if ('function' == typeof routeModule || routeModule && 'object' == typeof routeModule && '$$typeof' in routeModule) return routeModule;
     if (!routeModule || 'object' != typeof routeModule) return;
+    if (seen.has(routeModule)) return;
+    seen.add(routeModule);
     const module = routeModule;
-    const component = module.default || module.Component;
-    if ('function' == typeof component || component && 'object' == typeof component && '$$typeof' in component) return component;
+    for (const candidate of [
+        module.default,
+        module.Component
+    ]){
+        const component = pickRouteModuleComponent(candidate, seen);
+        if (component) return component;
+    }
 }
 function createServerLazyImportComponent(lazyImport, fallbackComponent) {
     if ("u" > typeof document) return fallbackComponent;

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

@@ -56,12 +56,19 @@ function normalizeModernLoaderResponse(result) {
     }
     return normalizeModernLoaderResult(result);
 }
-function pickRouteModuleComponent(routeModule) {
+function pickRouteModuleComponent(routeModule, seen = new Set()) {
     if ('function' == typeof routeModule || routeModule && 'object' == typeof routeModule && '$$typeof' in routeModule) return routeModule;
     if (!routeModule || 'object' != typeof routeModule) return;
+    if (seen.has(routeModule)) return;
+    seen.add(routeModule);
     const module = routeModule;
-    const component = module.default || module.Component;
-    if ('function' == typeof component || component && 'object' == typeof component && '$$typeof' in component) return component;
+    for (const candidate of [
+        module.default,
+        module.Component
+    ]){
+        const component = pickRouteModuleComponent(candidate, seen);
+        if (component) return component;
+    }
 }
 function createServerLazyImportComponent(lazyImport, fallbackComponent) {
     if ("u" > typeof document) return fallbackComponent;

package/package.json

@@ -18,7 +18,7 @@
     "modern.js",
     "tanstack-router"
   ],
-  "version": "3.2.0-ultramodern.81",
+  "version": "3.2.0-ultramodern.83",
   "engines": {
     "node": ">=20"
   },
@@ -88,13 +88,13 @@
     "@swc/helpers": "^0.5.21",
     "@tanstack/react-router": "1.170.8",
     "@tanstack/router-core": "1.171.6",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.2.0-ultramodern.81",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.81",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.81",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.2.0-ultramodern.81"
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.2.0-ultramodern.83",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.2.0-ultramodern.83",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.83",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.83"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "3.2.0-ultramodern.81",
+    "@modern-js/runtime": "3.2.0-ultramodern.83",
     "react": "^19.2.6",
     "react-dom": "^19.2.6"
   },
@@ -109,8 +109,8 @@
     "@typescript/native-preview": "7.0.0-dev.20260527.2",
     "react": "^19.2.6",
     "react-dom": "^19.2.6",
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.2.0-ultramodern.81",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.2.0-ultramodern.81",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.2.0-ultramodern.83",
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.2.0-ultramodern.83",
     "@scripts/rstest-config": "2.66.0"
   },
   "sideEffects": false,

package/src/runtime/routeTree.ts

@@ -231,6 +231,7 @@ function normalizeModernLoaderResponse(result: unknown): unknown {
 
 function pickRouteModuleComponent(
   routeModule: unknown,
+  seen: Set<unknown> = new Set(),
 ): ElementType<Record<string, unknown>> | undefined {
   if (
     typeof routeModule === 'function' ||
@@ -244,14 +245,17 @@ function pickRouteModuleComponent(
   if (!routeModule || typeof routeModule !== 'object') {
     return undefined;
   }
+  if (seen.has(routeModule)) {
+    return undefined;
+  }
+  seen.add(routeModule);
 
   const module = routeModule as ModernRouteModule;
-  const component = module.default || module.Component;
-  if (
-    typeof component === 'function' ||
-    (component && typeof component === 'object' && '$$typeof' in component)
-  ) {
-    return component as ElementType<Record<string, unknown>>;
+  for (const candidate of [module.default, module.Component]) {
+    const component = pickRouteModuleComponent(candidate, seen);
+    if (component) {
+      return component;
+    }
   }
 
   return undefined;

package/tests/router/routeTree.test.ts

@@ -26,7 +26,7 @@ type TestRouteObject = RouteObject & {
   hasLoader?: boolean;
   inValidSSRRoute?: boolean;
   isClientComponent?: boolean;
-  lazyImport?: () => Promise<{ default: ComponentType }>;
+  lazyImport?: () => Promise<unknown>;
 };
 
 type TestNestedRoute = NestedRoute & {
@@ -305,6 +305,40 @@ describe('tanstack route tree from RouteObject[]', () => {
     ).toContain('Lazy child route ready');
   });
 
+  test('unwraps nested ESM route module defaults before server rendering', async () => {
+    const LazyRouteComponent = () =>
+      createElement('main', null, 'Nested lazy child route ready');
+    const lazyImport = rstest.fn(async () => ({
+      default: {
+        default: LazyRouteComponent,
+      },
+    }));
+    const routes: TestRouteObject[] = [
+      {
+        id: 'root',
+        path: '/',
+        Component: () => createElement('section', null, createElement(Outlet)),
+        children: [
+          {
+            id: 'lazy',
+            path: 'lazy',
+            Component: lazy(
+              lazyImport as () => Promise<{ default: ComponentType }>,
+            ),
+            lazyImport,
+          },
+        ],
+      },
+    ];
+
+    const routeTree = createRouteTreeFromRouteObjects(routes);
+    const router = await loadRouteTree(routeTree, '/lazy');
+
+    expect(
+      renderToStaticMarkup(createElement(RouterProvider, { router } as never)),
+    ).toContain('Nested lazy child route ready');
+  });
+
   test('preserves route handle and maps shouldRevalidate to shouldReload', async () => {
     const shouldRevalidate = rstest.fn(({ nextUrl }: ShouldRevalidateArgs) =>
       nextUrl.pathname.endsWith('/456'),