@bleedingdev/modern-js-plugin-tanstack 3.5.0-ultramodern.34 → 3.5.0-ultramodern.36

package/dist/cjs/runtime/rsc/payloadFetch.js

@@ -51,6 +51,7 @@ function isServerPayload(value) {
 function createPayloadFetchKey(request) {
     return JSON.stringify([
         request.url,
+        request.method,
         [
             ...request.headers.entries()
         ].sort(([left], [right])=>left.localeCompare(right))

package/dist/esm/runtime/rsc/payloadFetch.mjs

@@ -13,6 +13,7 @@ function isServerPayload(value) {
 function createPayloadFetchKey(request) {
     return JSON.stringify([
         request.url,
+        request.method,
         [
             ...request.headers.entries()
         ].sort(([left], [right])=>left.localeCompare(right))

package/dist/esm-node/runtime/rsc/payloadFetch.mjs

@@ -14,6 +14,7 @@ function isServerPayload(value) {
 function createPayloadFetchKey(request) {
     return JSON.stringify([
         request.url,
+        request.method,
         [
             ...request.headers.entries()
         ].sort(([left], [right])=>left.localeCompare(right))

package/package.json

@@ -18,7 +18,7 @@
     "modern.js",
     "tanstack-router"
   ],
-  "version": "3.5.0-ultramodern.34",
+  "version": "3.5.0-ultramodern.36",
   "engines": {
     "node": ">=20"
   },
@@ -98,14 +98,14 @@
     "@tanstack/react-router": "1.170.16",
     "@tanstack/router-core": "1.171.13",
     "react-server-dom-rspack": "0.0.2",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.5.0-ultramodern.34",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.5.0-ultramodern.34",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.34",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.34"
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.5.0-ultramodern.36",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.5.0-ultramodern.36",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.36",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.36"
   },
   "peerDependencies": {
-    "@modern-js/app-tools": "3.5.0-ultramodern.34",
-    "@modern-js/runtime": "3.5.0-ultramodern.34",
+    "@modern-js/app-tools": "3.5.0-ultramodern.36",
+    "@modern-js/runtime": "3.5.0-ultramodern.36",
     "react": "^19.2.7",
     "react-dom": "^19.2.7"
   },
@@ -120,8 +120,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.34",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.5.0-ultramodern.34",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.5.0-ultramodern.36",
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.5.0-ultramodern.36",
     "@scripts/rstest-config": "2.66.0"
   },
   "sideEffects": [

package/rstest.config.mts

@@ -33,6 +33,7 @@ export default {
         'tests/router/preloadRedirect.test.ts',
         'tests/router/register.test.ts',
         'tests/router/routeHooks.test.ts',
+        'tests/router/rscPayloadRouterMatrix.test.ts',
         'tests/router/rsc.test.tsx',
         'tests/router/slotUsageSanitizer.test.ts',
         'tests/router/ssrPreload.test.ts',

package/src/runtime/rsc/payloadFetch.ts

@@ -31,6 +31,7 @@ export function isServerPayload(value: unknown): value is ServerPayload {
 export function createPayloadFetchKey(request: Request) {
   return JSON.stringify([
     request.url,
+    request.method,
     [...request.headers.entries()].sort(([left], [right]) =>
       left.localeCompare(right),
     ),

package/tests/router/rscPayloadRouterMatrix.test.ts

@@ -0,0 +1,197 @@
+import {
+  __setTanstackRscPayloadDecoderForTests,
+  createTanstackRscServerPayload,
+  handleTanstackRscRedirect,
+  loadTanstackRscRouteData,
+} from '../../src/runtime/rsc/payloadRouter';
+
+function createPayload(
+  routeId: string,
+  loaderData: unknown,
+  options: { errors?: Record<string, unknown> | null } = {},
+) {
+  return {
+    type: 'render',
+    actionData: null,
+    errors: options.errors ?? null,
+    loaderData: loaderData === undefined ? {} : { [routeId]: loaderData },
+    location: { href: routeId },
+    routes: [{ id: routeId, hasLoader: true }],
+  };
+}
+
+async function decodeJsonPayload(stream: ReadableStream<Uint8Array>) {
+  return JSON.parse(await new Response(stream).text());
+}
+
+describe('tanstack rsc payload router matrix', () => {
+  afterEach(() => {
+    __setTanstackRscPayloadDecoderForTests();
+    rstest.restoreAllMocks();
+  });
+
+  test('normalizes redirect basenames while preserving status and non-location headers', () => {
+    const scenarios = [
+      {
+        location: '/base',
+        name: 'exact basename',
+        redirect: '/',
+      },
+      {
+        location: '/base/login?from=%2Fbase',
+        name: 'leading basename',
+        redirect: '/login?from=%2Fbase',
+      },
+      {
+        location: '/shop/base/login',
+        name: 'mid-path basename',
+        redirect: '/shop/base/login',
+      },
+    ] as const;
+
+    for (const scenario of scenarios) {
+      const response = handleTanstackRscRedirect(
+        new Headers({
+          Location: scenario.location,
+          'X-Trace': scenario.name,
+        }),
+        '/base',
+        307,
+      );
+
+      expect(response.status).toBe(307);
+      expect(response.headers.get('Location')).toBeNull();
+      expect(response.headers.get('X-Modernjs-BaseUrl')).toBe('/base');
+      expect(response.headers.get('X-Modernjs-Redirect')).toBe(
+        scenario.redirect,
+      );
+      expect(response.headers.get('X-Trace')).toBe(scenario.name);
+    }
+  });
+
+  test('separates payload fetch cache entries by URL and request method', async () => {
+    const payloads = [
+      createPayload('/resource', { method: 'GET' }),
+      createPayload('/resource', { method: 'POST' }),
+    ];
+    let payloadIndex = 0;
+    const fetchMock = rstest.fn(() =>
+      Promise.resolve(new Response(JSON.stringify(payloads[payloadIndex++]))),
+    );
+    rstest.stubGlobal('fetch', fetchMock);
+    __setTanstackRscPayloadDecoderForTests(decodeJsonPayload);
+
+    const [getData, postData] = await Promise.all([
+      loadTanstackRscRouteData({
+        loadClientData: async () => ({ fallback: 'get' }),
+        request: new Request('http://localhost/resource', { method: 'GET' }),
+        routeId: '/resource',
+      }),
+      loadTanstackRscRouteData({
+        loadClientData: async () => ({ fallback: 'post' }),
+        request: new Request('http://localhost/resource', { method: 'POST' }),
+        routeId: '/resource',
+      }),
+    ]);
+
+    expect(getData).toEqual({ method: 'GET' });
+    expect(postData).toEqual({ method: 'POST' });
+    expect(fetchMock).toHaveBeenCalledTimes(2);
+    expect(fetchMock.mock.calls.map(call => call[0])).toEqual([
+      'http://localhost/resource',
+      'http://localhost/resource',
+    ]);
+  });
+
+  test('rethrows matched route errors from the decoded payload', async () => {
+    const routeError = new Error('route loader failed');
+    const payload = createPayload('/broken', undefined, {
+      errors: { '/broken': routeError },
+    });
+    rstest.stubGlobal(
+      'fetch',
+      rstest.fn(() => Promise.resolve(new Response('payload'))),
+    );
+    __setTanstackRscPayloadDecoderForTests(async () => payload);
+
+    await expect(
+      loadTanstackRscRouteData({
+        loadClientData: async () => ({ fallback: true }),
+        request: new Request('http://localhost/broken'),
+        routeId: '/broken',
+      }),
+    ).rejects.toBe(routeError);
+  });
+
+  test('returns undefined for route ids missing from the decoded payload', async () => {
+    const loadClientData = rstest.fn(async () => ({ fallback: true }));
+    const payload = createPayload('/known', { known: true });
+    rstest.stubGlobal(
+      'fetch',
+      rstest.fn(() => Promise.resolve(new Response('payload'))),
+    );
+    __setTanstackRscPayloadDecoderForTests(async () => payload);
+
+    await expect(
+      loadTanstackRscRouteData({
+        loadClientData,
+        request: new Request('http://localhost/missing'),
+        routeId: '/missing',
+      }),
+    ).resolves.toBeUndefined();
+    expect(loadClientData).not.toHaveBeenCalled();
+  });
+
+  test('omits server payload matches with no route identity', () => {
+    const payload = createTanstackRscServerPayload({
+      state: {
+        location: { href: '/kept' },
+        matches: [
+          {
+            loaderData: { omitted: true },
+            params: {},
+            pathname: '/missing-id',
+            pathnameBase: '/missing-id',
+            route: {
+              options: {
+                path: 'missing-id',
+                staticData: { modernRouteHasLoader: true },
+              },
+            },
+          },
+          {
+            loaderData: { kept: true },
+            params: {},
+            pathname: '/kept',
+            pathnameBase: '/kept',
+            route: {
+              id: '/kept',
+              options: {
+                path: 'kept',
+                staticData: { modernRouteHasLoader: true },
+              },
+            },
+          },
+        ],
+      },
+    });
+
+    expect(payload.loaderData).toEqual({ '/kept': { kept: true } });
+    expect(payload.routes).toEqual([
+      {
+        handle: undefined,
+        hasAction: false,
+        hasClientLoader: false,
+        hasErrorBoundary: false,
+        hasLoader: true,
+        id: '/kept',
+        index: undefined,
+        params: {},
+        parentId: undefined,
+        path: 'kept',
+        pathname: '/kept',
+        pathnameBase: '/kept',
+      },
+    ]);
+  });
+});