@bleedingdev/modern-js-plugin-tanstack 3.5.0-ultramodern.102 → 3.5.0-ultramodern.103

package/dist/types/runtime/ssrTypes.d.ts

@@ -27,7 +27,6 @@ type RouterRouteWithOptions = {
     options?: RouterRouteOptions;
 };
 export type TanstackRouterWithServerSsr = AnyRouter & {
-    resolveRedirect?: (redirect: Response) => Response;
     routesById?: Record<string, RouterRouteWithOptions>;
     serverSsr?: {
         cleanup?: () => void;
@@ -38,7 +37,6 @@ export type TanstackRouterWithServerSsr = AnyRouter & {
     };
     state: AnyRouter['state'] & {
         matches?: unknown;
-        redirect?: Response;
     };
 };
 export {};

package/package.json

@@ -18,7 +18,7 @@
     "modern.js",
     "tanstack-router"
   ],
-  "version": "3.5.0-ultramodern.102",
+  "version": "3.5.0-ultramodern.103",
   "engines": {
     "node": ">=20"
   },
@@ -94,35 +94,41 @@
     }
   },
   "dependencies": {
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.5.0-ultramodern.102",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.5.0-ultramodern.102",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.102",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.102",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.5.0-ultramodern.103",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.5.0-ultramodern.103",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.103",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.103",
     "@swc/helpers": "^0.5.23",
-    "@tanstack/react-router": "1.170.17",
-    "@tanstack/router-core": "1.171.14",
-    "react-server-dom-rspack": "0.0.2"
+    "@tanstack/react-router": "1.170.25",
+    "@tanstack/router-core": "1.171.21"
   },
   "peerDependencies": {
-    "@modern-js/app-tools": "3.5.0-ultramodern.102",
-    "@modern-js/runtime": "3.5.0-ultramodern.102",
-    "react": "^19.2.7",
-    "react-dom": "^19.2.7"
+    "@modern-js/app-tools": "3.5.0-ultramodern.103",
+    "@modern-js/runtime": "3.5.0-ultramodern.103",
+    "react": "^19.2.8",
+    "react-dom": "^19.2.8",
+    "react-server-dom-rspack": "0.0.3"
+  },
+  "peerDependenciesMeta": {
+    "react-server-dom-rspack": {
+      "optional": true
+    }
   },
   "devDependencies": {
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.5.0-ultramodern.102",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.5.0-ultramodern.102",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.5.0-ultramodern.103",
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.5.0-ultramodern.103",
     "@rslib/core": "0.23.2",
     "@scripts/rstest-config": "2.66.0",
-    "@tanstack/history": "1.162.0",
+    "@tanstack/history": "1.162.1",
     "@testing-library/react": "^16.3.2",
     "@tsconfig/strictest": "2.0.8",
-    "@types/node": "^26.1.1",
-    "@types/react": "^19.2.17",
-    "@types/react-dom": "^19.2.3",
+    "@types/node": "^26.2.0",
+    "@types/react": "^19.2.18",
+    "@types/react-dom": "^19.2.4",
     "@typescript/native-preview": "7.0.0-dev.20260707.2",
-    "react": "^19.2.7",
-    "react-dom": "^19.2.7"
+    "react": "^19.2.8",
+    "react-dom": "^19.2.8",
+    "react-server-dom-rspack": "0.0.3"
   },
   "sideEffects": [
     "./src/runtime/register.ts",

package/rstest.config.mts

@@ -35,6 +35,8 @@ export default {
         'tests/router/preloadRedirect.test.ts',
         'tests/router/register.test.ts',
         'tests/router/routeHooks.test.ts',
+        'tests/router/serverPlugin.test.ts',
+        'tests/router/rscDecoderSecurity.test.ts',
         'tests/router/rscPayloadRouterMatrix.test.ts',
         'tests/router/rsc.test.tsx',
         'tests/router/slotUsageSanitizer.test.ts',

package/src/cli/index.ts

@@ -76,6 +76,8 @@ type RuntimeRouterCliHelpers = {
     options?: {
       entrypointsKey?: string;
       hydrateRscClientRoutes?: boolean;
+      includeRouteServerLoadersInSsrEntry?: boolean;
+      isolateRouteDataInRscLayer?: boolean;
       serverRoutesFileName?: string;
     },
   ) => Promise<Record<string, (NestedRouteForCli | PageRoute)[]>>;
@@ -268,6 +270,8 @@ export function tanstackRouterPlugin(
           {
             entrypointsKey: ENTRYPOINTS_KEY,
             hydrateRscClientRoutes: true,
+            includeRouteServerLoadersInSsrEntry: false,
+            isolateRouteDataInRscLayer: true,
             serverRoutesFileName: 'tanstack-routes.server.js',
           },
         );
@@ -296,6 +300,8 @@ export function tanstackRouterPlugin(
               {
                 entrypointsKey: ENTRYPOINTS_KEY,
                 hydrateRscClientRoutes: true,
+                includeRouteServerLoadersInSsrEntry: false,
+                isolateRouteDataInRscLayer: true,
                 serverRoutesFileName: 'tanstack-routes.server.js',
               },
             );

package/src/cli/tanstackTypes/canonicalRoutes.ts

@@ -1,6 +1,5 @@
 // @effect-diagnostics asyncFunction:off strictBooleanExpressions:off
 
-import path from 'node:path';
 import type { NestedRouteForCli, PageRoute } from '@modern-js/types';
 import { MAIN_ENTRY_NAME } from '@modern-js/utils';
 

package/src/cli/tanstackTypes/shared.ts

@@ -1,6 +1,5 @@
 // @effect-diagnostics asyncFunction:off strictBooleanExpressions:off
 
-import path from 'node:path';
 import { getPathWithoutExt } from '@modern-js/runtime/cli';
 import type { NestedRouteForCli, PageRoute } from '@modern-js/types';
 import { findExists, formatImportPath, slash } from '@modern-js/utils';

package/src/cli/tanstackTypes/source.ts

@@ -1,6 +1,5 @@
 // @effect-diagnostics asyncFunction:off strictBooleanExpressions:off
 
-import path from 'node:path';
 import type {
   AppNormalizedConfig,
   AppTools,
@@ -8,6 +7,7 @@ import type {
 } 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 {
   createRouteStaticDataSnippet,

package/src/runtime/plugin.node.tsx

@@ -1,6 +1,4 @@
 // @effect-diagnostics asyncFunction:off newPromise:off strictBooleanExpressions:off unnecessaryArrowBlock:off
-/// <reference path="./ssr-shim.d.ts" />
-
 import {
   getGlobalEnableRsc,
   type InternalRouterServerSnapshot,
@@ -175,10 +173,18 @@ export const tanstackRouterPlugin = (
           context.ssrContext?.onTiming?.(LOADER_REPORTER_NAME, cost);
         }
 
-        if (serverRouter.state.redirect) {
-          const resolved = serverRouter.resolveRedirect
-            ? serverRouter.resolveRedirect(serverRouter.state.redirect)
-            : serverRouter.state.redirect;
+        const serverLoadResult = serverRouter._serverResult;
+        if (!serverLoadResult) {
+          try {
+            serverRouter.serverSsr?.cleanup?.();
+          } catch {}
+          throw new Error(
+            'TanStack Router completed an SSR load without a server result.',
+          );
+        }
+
+        if (serverLoadResult.type === 'redirect') {
+          const { redirect } = serverLoadResult;
 
           try {
             serverRouter.serverSsr?.cleanup?.();
@@ -187,11 +193,11 @@ export const tanstackRouterPlugin = (
           return interrupt(
             isRSCNavigation
               ? handleTanstackRscRedirect(
-                  resolved.headers,
+                  redirect.headers,
                   _basename,
-                  resolved.status,
+                  redirect.status,
                 )
-              : resolved,
+              : redirect,
           );
         }
 
@@ -214,7 +220,7 @@ export const tanstackRouterPlugin = (
           context.ssrContext?.response as
             | { status: (code: number) => void }
             | undefined
-        )?.status(tanstackRouter.state.statusCode);
+        )?.status(serverLoadResult.status);
 
         await serverRouter.serverSsr?.dehydrate?.();
 
@@ -240,7 +246,7 @@ export const tanstackRouterPlugin = (
           createRouterServerSnapshot({
             framework: 'tanstack',
             basename: _basename,
-            statusCode: tanstackRouter.state.statusCode,
+            statusCode: serverLoadResult.status,
             errors: routerErrors,
             matchedRouteIds,
             hydrationScripts,

package/src/runtime/plugin.tsx

@@ -1,6 +1,4 @@
 // @effect-diagnostics globalConsole:off strictBooleanExpressions:off
-/// <reference path="./ssr-shim.d.ts" />
-
 import {
   getGlobalEnableRsc,
   InternalRuntimeContext,

package/src/runtime/pluginShared.ts

@@ -87,12 +87,13 @@ export function createTanstackRouteObjects({
   ssrMode?: SSRMode;
 }): RouteObject[] {
   const { mergedConfig, finalRouteConfig } = routeConfig;
-  const routeObjects = mergedConfig.createRoutes
-    ? mergedConfig.createRoutes()
-    : createTanstackRouteObjectsFromConfig({
-        routesConfig: finalRouteConfig,
-        ssrMode,
-      }) || [];
+  const routeObjects =
+    mergedConfig.createRoutes !== undefined
+      ? mergedConfig.createRoutes()
+      : (createTanstackRouteObjectsFromConfig({
+          routesConfig: finalRouteConfig,
+          ssrMode,
+        }) ?? []);
 
   return hooks.modifyRoutes.call(routeObjects) as RouteObject[];
 }
@@ -105,7 +106,7 @@ export function joinBasename(baseUrl: string, basename: string): string {
       ? normalizedBase.replace(/\/+$/g, '')
       : normalizedBase;
   const trimmedBasename = basename.replace(/^\/+|\/+$/g, '');
-  if (!trimmedBasename) {
+  if (trimmedBasename.length === 0) {
     return trimmedBase || '/';
   }
   return `${trimmedBase}/${trimmedBasename}`.replace(/\/{2,}/g, '/');

package/src/runtime/rsc/payloadErrors.ts

@@ -1,6 +1,6 @@
 // @effect-diagnostics asyncFunction:off globalFetch:off processEnv:off strictBooleanExpressions:off
 import type { ServerPayload } from '@modern-js/runtime/context';
-import { isRouteErrorResponse } from '@modern-js/runtime-utils/router';
+import { isRouteErrorResponse } from '@modern-js/runtime/routerHelper';
 
 export function shouldRedactServerError(status = 500) {
   return (

package/src/runtime/rsc/shared.ts

@@ -62,7 +62,7 @@ export function renderSelectedTree(
     missingTreeError,
   }: RenderSelectedTreeOptions,
 ) {
-  if (!getTree) {
+  if (getTree === undefined) {
     throw new Error(missingTreeError);
   }
 

package/src/runtime/rsc/treeGetter.tsx

@@ -18,18 +18,19 @@ function loadModernRscClientRuntime() {
   return modernRscClientRuntimePromise;
 }
 
-async function createFromFlightStream(stream: ReadableStream<Uint8Array>) {
+function createFromFlightStream(stream: ReadableStream<Uint8Array>) {
   if (typeof window === 'undefined') {
-    const runtime: ServerRscClientRuntime = await import(
-      'react-server-dom-rspack/client.edge'
+    return import('react-server-dom-rspack/client.edge').then(
+      (runtime: ServerRscClientRuntime) =>
+        runtime.createFromReadableStream(stream),
     );
-    return runtime.createFromReadableStream(stream);
   }
 
-  const runtime = await loadModernRscClientRuntime();
-  return runtime.createFromReadableStream(stream, {
-    callServer: runtime.callServer,
-  });
+  return loadModernRscClientRuntime().then(runtime =>
+    runtime.createFromReadableStream(stream, {
+      callServer: runtime.callServer,
+    }),
+  );
 }
 
 export function createTreeGetterFromFlightStream(

package/src/runtime/ssrManagedTags.ts

@@ -1,6 +1,4 @@
 // @effect-diagnostics asyncFunction:off newPromise:off strictBooleanExpressions:off
-/// <reference path="./ssr-shim.d.ts" />
-
 import type { AnyRouter } from '@tanstack/react-router';
 import type {
   RouterManagedTag,

package/src/runtime/ssrTypes.ts

@@ -1,5 +1,3 @@
-/// <reference path="./ssr-shim.d.ts" />
-
 import type { RequestContext } from '@modern-js/runtime-utils/node';
 import type { AnyRouter } from '@tanstack/react-router';
 
@@ -35,7 +33,6 @@ type RouterRouteWithOptions = {
 };
 
 export type TanstackRouterWithServerSsr = AnyRouter & {
-  resolveRedirect?: (redirect: Response) => Response;
   routesById?: Record<string, RouterRouteWithOptions>;
   serverSsr?: {
     cleanup?: () => void;
@@ -46,6 +43,5 @@ export type TanstackRouterWithServerSsr = AnyRouter & {
   };
   state: AnyRouter['state'] & {
     matches?: unknown;
-    redirect?: Response;
   };
 };

package/src/runtime/submitAction.ts

@@ -32,21 +32,16 @@ type RouteLoader = (args: {
 }) => Promise<unknown> | unknown;
 
 type RouterBuildLocationOptions = Parameters<AnyRouter['buildLocation']>[0];
-type RouterBuiltLocation = ReturnType<AnyRouter['buildLocation']> & {
-  pathname: string;
-};
-type RouterParsedLocation = Parameters<AnyRouter['getParsedLocationHref']>[0];
 type RouterNavigateOptions = Parameters<AnyRouter['navigate']>[0];
 
 function resolveRouteHandlers(router: AnyRouter, actionTo: string) {
   const builtLocation = router.buildLocation({
     to: actionTo,
-  } as RouterBuildLocationOptions) as RouterBuiltLocation;
-  const href = router.getParsedLocationHref(
-    builtLocation as RouterParsedLocation,
+  } as RouterBuildLocationOptions);
+  const [, routeParams, foundRoute] = router.getMatchedRoutes(
+    builtLocation.pathname,
   );
-  const matchedRoutes = router.getMatchedRoutes(builtLocation.pathname);
-  const routeStaticData = matchedRoutes.foundRoute?.options?.staticData as
+  const routeStaticData = foundRoute?.options?.staticData as
     | Record<string, unknown>
     | undefined;
   const action = routeStaticData?.modernRouteAction as RouteAction | undefined;
@@ -55,8 +50,8 @@ function resolveRouteHandlers(router: AnyRouter, actionTo: string) {
   return {
     action,
     loader,
-    href,
-    params: (matchedRoutes.routeParams || {}) as Record<string, string>,
+    href: builtLocation.href,
+    params: routeParams,
   };
 }
 

package/src/types/react-server-dom-rspack.d.ts

@@ -1,56 +1,8 @@
+// react-server-dom-rspack does not publish TypeScript declarations. This is the
+// smallest ambient contract used by the TanStack RSC stream bridge; executable
+// decoder tests cover the exact patched upstream development dependency.
 declare module 'react-server-dom-rspack/client.edge' {
-  import type { TemporaryReferenceSet } from 'react-server-dom-rspack';
-
-  export type { TemporaryReferenceSet };
-
-  export const createTemporaryReferenceSet: (
-    ...args: unknown[]
-  ) => TemporaryReferenceSet;
-
-  export function createServerReference(
-    id: string,
-  ): (...args: unknown[]) => Promise<unknown>;
-
-  export type EncodeFormActionCallback = <A>(
-    id: unknown,
-    args: Promise<A>,
-  ) => ReactCustomFormAction;
-
-  export type ReactCustomFormAction = {
-    name?: string;
-    action?: string;
-    encType?: string;
-    method?: string;
-    target?: string;
-    data?: null | FormData;
-  };
-
-  export interface Options {
-    nonce?: string;
-    encodeFormAction?: EncodeFormActionCallback;
-    temporaryReferences?: TemporaryReferenceSet;
-    replayConsoleLogs?: boolean;
-    environmentName?: string;
-    debugChannel?: {
-      readable?: ReadableStream;
-    };
-  }
-
-  export function createFromFetch<T>(
-    promiseForResponse: Promise<Response>,
-    options?: Options,
-  ): Promise<T>;
-
   export function createFromReadableStream<T>(
-    stream: ReadableStream,
-    options?: Options,
+    stream: ReadableStream<Uint8Array>,
   ): Promise<T>;
-
-  export const encodeReply: (
-    value: unknown,
-    options?: {
-      temporaryReferences?: TemporaryReferenceSet;
-      signal?: AbortSignal;
-    },
-  ) => Promise<string | FormData>;
 }

package/tests/router/cli.test.ts

@@ -803,6 +803,8 @@ describe('tanstack router cli plugin', () => {
       {
         entrypointsKey: '@modern-js/plugin-tanstack',
         hydrateRscClientRoutes: true,
+        includeRouteServerLoadersInSsrEntry: false,
+        isolateRouteDataInRscLayer: true,
         serverRoutesFileName: 'tanstack-routes.server.js',
       },
     );

package/tests/router/clientHydration.test.tsx

@@ -1,9 +1,13 @@
 import type { AnyRouter } from '@tanstack/react-router';
-import { render, screen } from '@testing-library/react';
+import { act, render, screen, waitFor } from '@testing-library/react';
 import React, { Suspense } from 'react';
 import { ModernRouterClient } from '../../src/runtime/clientHydration';
+import { createTreeGetterFromFlightStream } from '../../src/runtime/rsc/treeGetter';
 
 let hydrateImpl: () => Promise<unknown>;
+let createFromReadableStreamImpl: () => Promise<unknown>;
+let registeredCallServer: unknown;
+let decoderCallServer: unknown;
 
 rstest.mock('@tanstack/react-router', () => ({
   RouterProvider: ({ router }: { router: { label: string } }) => (
@@ -15,6 +19,24 @@ rstest.mock('@tanstack/react-router/ssr/client', () => ({
   hydrate: () => hydrateImpl(),
 }));
 
+rstest.mock('@modern-js/runtime/rsc/client', () => {
+  const callServer = () => undefined;
+
+  return {
+    callServer,
+    createFromReadableStream: (
+      _stream: ReadableStream<Uint8Array>,
+      options: { callServer: unknown },
+    ) => {
+      decoderCallServer = options.callServer;
+      return createFromReadableStreamImpl();
+    },
+    setServerCallback: (callback: unknown) => {
+      registeredCallServer = callback;
+    },
+  };
+});
+
 function createDeferred<T>() {
   let resolve!: (value: T | PromiseLike<T>) => void;
   let reject!: (reason?: unknown) => void;
@@ -37,6 +59,41 @@ function createRouter(label: string): AnyRouter {
   } as unknown as AnyRouter;
 }
 
+function FlightTree({ getTree }: { getTree: () => unknown }) {
+  const tree = getTree();
+  if (
+    typeof tree !== 'object' ||
+    tree === null ||
+    !('label' in tree) ||
+    typeof tree.label !== 'string'
+  ) {
+    throw new Error('Expected the decoded Flight tree to contain a label.');
+  }
+  return <div data-testid="flight-tree">{tree.label}</div>;
+}
+
+class FlightErrorBoundary extends React.Component<
+  { children: React.ReactNode; onError: (error: unknown) => void },
+  { error: unknown }
+> {
+  state = { error: undefined };
+
+  static getDerivedStateFromError(error: unknown) {
+    return { error };
+  }
+
+  componentDidCatch(error: unknown) {
+    this.props.onError(error);
+  }
+
+  render() {
+    if (this.state.error !== undefined) {
+      return <div data-testid="flight-error">failed</div>;
+    }
+    return this.props.children;
+  }
+}
+
 describe('TanStack SSR client hydration', () => {
   it('keeps the router behind Suspense until late SSR hydration completes', async () => {
     const hydration = createDeferred<void>();
@@ -58,4 +115,86 @@ describe('TanStack SSR client hydration', () => {
     ).toContain('inventory');
     expect(screen.queryByTestId('hydrating')).toBeNull();
   });
+
+  it('reuses one Flight decode while suspended and returns the resolved tree synchronously', async () => {
+    const flight = createDeferred<unknown>();
+    const decodeFlight = rstest.fn(() => flight.promise);
+    createFromReadableStreamImpl = decodeFlight;
+    registeredCallServer = undefined;
+    decoderCallServer = undefined;
+
+    const getTree = createTreeGetterFromFlightStream(
+      new ReadableStream<Uint8Array>(),
+    );
+    const view = (
+      <Suspense fallback={<div data-testid="flight-loading">loading</div>}>
+        <FlightTree getTree={getTree} />
+      </Suspense>
+    );
+    const { rerender } = render(view);
+
+    expect(screen.getByTestId('flight-loading')).toBeTruthy();
+    await waitFor(() => expect(decodeFlight).toHaveBeenCalledTimes(1));
+    expect(registeredCallServer).toBe(decoderCallServer);
+
+    await act(() => rerender(view));
+    expect(screen.getByTestId('flight-loading')).toBeTruthy();
+    expect(decodeFlight).toHaveBeenCalledTimes(1);
+
+    const tree = { label: 'decoded inventory' };
+    await act(async () => {
+      flight.resolve(tree);
+      await flight.promise;
+    });
+
+    expect((await screen.findByTestId('flight-tree')).textContent).toBe(
+      tree.label,
+    );
+    expect(decodeFlight).toHaveBeenCalledTimes(1);
+    expect(getTree()).toBe(tree);
+  });
+
+  it('preserves the original Flight decode rejection for the error boundary', async () => {
+    const flight = createDeferred<unknown>();
+    const failure = new Error('Flight decode failed');
+    const decodeFlight = rstest.fn(() => flight.promise);
+    createFromReadableStreamImpl = decodeFlight;
+    let caughtError: unknown;
+    const errorLog = rstest
+      .spyOn(console, 'error')
+      .mockImplementation(() => undefined);
+
+    try {
+      const getTree = createTreeGetterFromFlightStream(
+        new ReadableStream<Uint8Array>(),
+      );
+      await act(() =>
+        render(
+          <FlightErrorBoundary
+            onError={error => {
+              caughtError = error;
+            }}
+          >
+            <Suspense
+              fallback={<div data-testid="flight-loading">loading</div>}
+            >
+              <FlightTree getTree={getTree} />
+            </Suspense>
+          </FlightErrorBoundary>,
+        ),
+      );
+
+      expect(screen.getByTestId('flight-loading')).toBeTruthy();
+      await waitFor(() => expect(decodeFlight).toHaveBeenCalledTimes(1));
+      await act(async () => {
+        flight.reject(failure);
+        await flight.promise.catch(() => undefined);
+      });
+
+      expect(await screen.findByTestId('flight-error')).toBeTruthy();
+      expect(caughtError).toBe(failure);
+    } finally {
+      errorLog.mockRestore();
+    }
+  });
 });