Merge branch 'main' into fix/validation-types-circular-reference

Author: swarnim02

README.md

@@ -13,7 +13,7 @@ alt="TanStack Router"
 
 A modern router designed for type safety, data‑driven navigation, and seamless developer experience.
 
-- End‑to‑end type safety (routes, params, loaders)
+- End‑to-end type safety (routes, params, loaders)
 - Schema‑driven search params with validation
 - Built‑in caching, prefetching & invalidation
 - Nested layouts, transitions & error boundaries
@@ -45,25 +45,12 @@ A full‑stack framework built on Router, designed for server rendering, streami
 
 <br />
 
-<div align="center">
-  <a href="https://npmjs.com/package/@tanstack/react-router">
-    <img src="https://img.shields.io/npm/dm/@tanstack/react-router.svg" alt="npm downloads" />
-  </a>
-  <a href="https://github.com/tanstack/router">
-    <img src="https://img.shields.io/github/stars/tanstack/router.svg?style=social&label=Star" alt="GitHub stars" />
-  </a>
-  <a href="https://bundlephobia.com/result?p=@tanstack/react-router">
-    <img src="https://badgen.net/bundlephobia/minzip/@tanstack/react-router" alt="Bundle size" />
-  </a>
-</div>
-
-<div align="center">
-  <a href="#badge">
-    <img alt="semantic-release" src="https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg">
-  </a>
-  <a href="https://bestofjs.org/projects/tanstack-router"><img alt="Best of JS" src="https://img.shields.io/endpoint?url=https://bestofjs-serverless.now.sh/api/project-badge?fullName=TanStack%2Frouter%26since=daily" /></a>
-  <a href="https://twitter.com/tan_stack"><img src="https://img.shields.io/twitter/follow/tan_stack.svg?style=social" alt="Follow @TanStack"/></a>
-</div>
+<p align="center">
+  <a href="https://npmjs.com/package/@tanstack/react-router"><img src="https://img.shields.io/npm/dm/@tanstack/react-router.svg" alt="npm downloads" /></a> <a href="https://github.com/tanstack/router"><img src="https://img.shields.io/github/stars/tanstack/router.svg?style=social&label=Star" alt="GitHub stars" /></a> <a href="https://bundlephobia.com/result?p=@tanstack/react-router"><img src="https://badgen.net/bundlephobia/minzip/@tanstack/react-router" alt="Bundle size" /></a>
+</p>
+<p align="center">
+  <a href="#badge"><img alt="semantic-release" src="https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg"></a> <a href="https://bestofjs.org/projects/tanstack-router"><img alt="Best of JS" src="https://img.shields.io/endpoint?url=https://bestofjs-serverless.now.sh/api/project-badge?fullName=TanStack%2Frouter%26since=daily" /></a> <a href="https://twitter.com/tan_stack"><img src="https://img.shields.io/twitter/follow/tan_stack.svg?style=social" alt="Follow @TanStack"/></a>
+</p>
 
 <div align="center">
 

e2e/react-start/basic/package.json

@@ -26,6 +26,7 @@
     "@tanstack/react-start": "workspace:^",
     "express": "^5.1.0",
     "http-proxy-middleware": "^3.0.5",
+    "js-cookie": "^3.0.5",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "redaxios": "^0.5.1",
@@ -35,6 +36,7 @@
     "@playwright/test": "^1.50.1",
     "@tailwindcss/postcss": "^4.1.15",
     "@tanstack/router-e2e-utils": "workspace:^",
+    "@types/js-cookie": "^3.0.6",
     "@types/node": "^22.10.2",
     "@types/react": "^19.0.8",
     "@types/react-dom": "^19.0.3",

e2e/react-start/basic/src/routeTree.gen.ts

@@ -28,6 +28,7 @@ import { Route as SearchParamsIndexRouteImport } from './routes/search-params/in
 import { Route as RedirectIndexRouteImport } from './routes/redirect/index'
 import { Route as PostsIndexRouteImport } from './routes/posts.index'
 import { Route as NotFoundIndexRouteImport } from './routes/not-found/index'
+import { Route as MultiCookieRedirectIndexRouteImport } from './routes/multi-cookie-redirect/index'
 import { Route as UsersUserIdRouteImport } from './routes/users.$userId'
 import { Route as SearchParamsLoaderThrowsRedirectRouteImport } from './routes/search-params/loader-throws-redirect'
 import { Route as SearchParamsDefaultRouteImport } from './routes/search-params/default'
@@ -36,6 +37,7 @@ import { Route as PostsPostIdRouteImport } from './routes/posts.$postId'
 import { Route as NotFoundViaLoaderRouteImport } from './routes/not-found/via-loader'
 import { Route as NotFoundViaHeadRouteImport } from './routes/not-found/via-head'
 import { Route as NotFoundViaBeforeLoadRouteImport } from './routes/not-found/via-beforeLoad'
+import { Route as MultiCookieRedirectTargetRouteImport } from './routes/multi-cookie-redirect/target'
 import { Route as ApiUsersRouteImport } from './routes/api.users'
 import { Route as LayoutLayout2RouteImport } from './routes/_layout/_layout-2'
 import { Route as RedirectTargetIndexRouteImport } from './routes/redirect/$target/index'
@@ -139,6 +141,12 @@ const NotFoundIndexRoute = NotFoundIndexRouteImport.update({
   path: '/',
   getParentRoute: () => NotFoundRouteRoute,
 } as any)
+const MultiCookieRedirectIndexRoute =
+  MultiCookieRedirectIndexRouteImport.update({
+    id: '/multi-cookie-redirect/',
+    path: '/multi-cookie-redirect/',
+    getParentRoute: () => rootRouteImport,
+  } as any)
 const UsersUserIdRoute = UsersUserIdRouteImport.update({
   id: '/$userId',
   path: '/$userId',
@@ -180,6 +188,12 @@ const NotFoundViaBeforeLoadRoute = NotFoundViaBeforeLoadRouteImport.update({
   path: '/via-beforeLoad',
   getParentRoute: () => NotFoundRouteRoute,
 } as any)
+const MultiCookieRedirectTargetRoute =
+  MultiCookieRedirectTargetRouteImport.update({
+    id: '/multi-cookie-redirect/target',
+    path: '/multi-cookie-redirect/target',
+    getParentRoute: () => rootRouteImport,
+  } as any)
 const ApiUsersRoute = ApiUsersRouteImport.update({
   id: '/api/users',
   path: '/api/users',
@@ -277,6 +291,7 @@ export interface FileRoutesByFullPath {
   '/users': typeof UsersRouteWithChildren
   '/대한민국': typeof Char45824Char54620Char48124Char44397Route
   '/api/users': typeof ApiUsersRouteWithChildren
+  '/multi-cookie-redirect/target': typeof MultiCookieRedirectTargetRoute
   '/not-found/via-beforeLoad': typeof NotFoundViaBeforeLoadRoute
   '/not-found/via-head': typeof NotFoundViaHeadRoute
   '/not-found/via-loader': typeof NotFoundViaLoaderRoute
@@ -285,6 +300,7 @@ export interface FileRoutesByFullPath {
   '/search-params/default': typeof SearchParamsDefaultRoute
   '/search-params/loader-throws-redirect': typeof SearchParamsLoaderThrowsRedirectRoute
   '/users/$userId': typeof UsersUserIdRoute
+  '/multi-cookie-redirect': typeof MultiCookieRedirectIndexRoute
   '/not-found/': typeof NotFoundIndexRoute
   '/posts/': typeof PostsIndexRoute
   '/redirect': typeof RedirectIndexRoute
@@ -313,13 +329,15 @@ export interface FileRoutesByTo {
   '/stream': typeof StreamRoute
   '/대한민국': typeof Char45824Char54620Char48124Char44397Route
   '/api/users': typeof ApiUsersRouteWithChildren
+  '/multi-cookie-redirect/target': typeof MultiCookieRedirectTargetRoute
   '/not-found/via-beforeLoad': typeof NotFoundViaBeforeLoadRoute
   '/not-found/via-head': typeof NotFoundViaHeadRoute
   '/not-found/via-loader': typeof NotFoundViaLoaderRoute
   '/posts/$postId': typeof PostsPostIdRoute
   '/search-params/default': typeof SearchParamsDefaultRoute
   '/search-params/loader-throws-redirect': typeof SearchParamsLoaderThrowsRedirectRoute
   '/users/$userId': typeof UsersUserIdRoute
+  '/multi-cookie-redirect': typeof MultiCookieRedirectIndexRoute
   '/not-found': typeof NotFoundIndexRoute
   '/posts': typeof PostsIndexRoute
   '/redirect': typeof RedirectIndexRoute
@@ -354,6 +372,7 @@ export interface FileRoutesById {
   '/대한민국': typeof Char45824Char54620Char48124Char44397Route
   '/_layout/_layout-2': typeof LayoutLayout2RouteWithChildren
   '/api/users': typeof ApiUsersRouteWithChildren
+  '/multi-cookie-redirect/target': typeof MultiCookieRedirectTargetRoute
   '/not-found/via-beforeLoad': typeof NotFoundViaBeforeLoadRoute
   '/not-found/via-head': typeof NotFoundViaHeadRoute
   '/not-found/via-loader': typeof NotFoundViaLoaderRoute
@@ -362,6 +381,7 @@ export interface FileRoutesById {
   '/search-params/default': typeof SearchParamsDefaultRoute
   '/search-params/loader-throws-redirect': typeof SearchParamsLoaderThrowsRedirectRoute
   '/users/$userId': typeof UsersUserIdRoute
+  '/multi-cookie-redirect/': typeof MultiCookieRedirectIndexRoute
   '/not-found/': typeof NotFoundIndexRoute
   '/posts/': typeof PostsIndexRoute
   '/redirect/': typeof RedirectIndexRoute
@@ -397,6 +417,7 @@ export interface FileRouteTypes {
     | '/users'
     | '/대한민국'
     | '/api/users'
+    | '/multi-cookie-redirect/target'
     | '/not-found/via-beforeLoad'
     | '/not-found/via-head'
     | '/not-found/via-loader'
@@ -405,6 +426,7 @@ export interface FileRouteTypes {
     | '/search-params/default'
     | '/search-params/loader-throws-redirect'
     | '/users/$userId'
+    | '/multi-cookie-redirect'
     | '/not-found/'
     | '/posts/'
     | '/redirect'
@@ -433,13 +455,15 @@ export interface FileRouteTypes {
     | '/stream'
     | '/대한민국'
     | '/api/users'
+    | '/multi-cookie-redirect/target'
     | '/not-found/via-beforeLoad'
     | '/not-found/via-head'
     | '/not-found/via-loader'
     | '/posts/$postId'
     | '/search-params/default'
     | '/search-params/loader-throws-redirect'
     | '/users/$userId'
+    | '/multi-cookie-redirect'
     | '/not-found'
     | '/posts'
     | '/redirect'
@@ -473,6 +497,7 @@ export interface FileRouteTypes {
     | '/대한민국'
     | '/_layout/_layout-2'
     | '/api/users'
+    | '/multi-cookie-redirect/target'
     | '/not-found/via-beforeLoad'
     | '/not-found/via-head'
     | '/not-found/via-loader'
@@ -481,6 +506,7 @@ export interface FileRouteTypes {
     | '/search-params/default'
     | '/search-params/loader-throws-redirect'
     | '/users/$userId'
+    | '/multi-cookie-redirect/'
     | '/not-found/'
     | '/posts/'
     | '/redirect/'
@@ -516,7 +542,9 @@ export interface RootRouteChildren {
   UsersRoute: typeof UsersRouteWithChildren
   Char45824Char54620Char48124Char44397Route: typeof Char45824Char54620Char48124Char44397Route
   ApiUsersRoute: typeof ApiUsersRouteWithChildren
+  MultiCookieRedirectTargetRoute: typeof MultiCookieRedirectTargetRoute
   RedirectTargetRoute: typeof RedirectTargetRouteWithChildren
+  MultiCookieRedirectIndexRoute: typeof MultiCookieRedirectIndexRoute
   RedirectIndexRoute: typeof RedirectIndexRoute
   PostsPostIdDeepRoute: typeof PostsPostIdDeepRoute
   FooBarQuxRoute: typeof FooBarQuxRouteWithChildren
@@ -643,6 +671,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof NotFoundIndexRouteImport
       parentRoute: typeof NotFoundRouteRoute
     }
+    '/multi-cookie-redirect/': {
+      id: '/multi-cookie-redirect/'
+      path: '/multi-cookie-redirect'
+      fullPath: '/multi-cookie-redirect'
+      preLoaderRoute: typeof MultiCookieRedirectIndexRouteImport
+      parentRoute: typeof rootRouteImport
+    }
     '/users/$userId': {
       id: '/users/$userId'
       path: '/$userId'
@@ -699,6 +734,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof NotFoundViaBeforeLoadRouteImport
       parentRoute: typeof NotFoundRouteRoute
     }
+    '/multi-cookie-redirect/target': {
+      id: '/multi-cookie-redirect/target'
+      path: '/multi-cookie-redirect/target'
+      fullPath: '/multi-cookie-redirect/target'
+      preLoaderRoute: typeof MultiCookieRedirectTargetRouteImport
+      parentRoute: typeof rootRouteImport
+    }
     '/api/users': {
       id: '/api/users'
       path: '/api/users'
@@ -973,7 +1015,9 @@ const rootRouteChildren: RootRouteChildren = {
   Char45824Char54620Char48124Char44397Route:
     Char45824Char54620Char48124Char44397Route,
   ApiUsersRoute: ApiUsersRouteWithChildren,
+  MultiCookieRedirectTargetRoute: MultiCookieRedirectTargetRoute,
   RedirectTargetRoute: RedirectTargetRouteWithChildren,
+  MultiCookieRedirectIndexRoute: MultiCookieRedirectIndexRoute,
   RedirectIndexRoute: RedirectIndexRoute,
   PostsPostIdDeepRoute: PostsPostIdDeepRoute,
   FooBarQuxRoute: FooBarQuxRouteWithChildren,

e2e/react-start/basic/src/routes/multi-cookie-redirect/index.tsx

@@ -0,0 +1,18 @@
+import { createFileRoute, redirect } from '@tanstack/react-router'
+import { createServerFn } from '@tanstack/react-start'
+import { setCookie } from '@tanstack/react-start/server'
+
+const setMultipleCookiesAndRedirect = createServerFn().handler(() => {
+  // Set multiple cookies before redirecting
+  // This tests that multiple Set-Cookie headers are preserved during redirect
+  setCookie('session', 'session-value', { path: '/' })
+  setCookie('csrf', 'csrf-token-value', { path: '/' })
+  setCookie('theme', 'dark', { path: '/' })
+
+  throw redirect({ to: '/multi-cookie-redirect/target' })
+})
+
+export const Route = createFileRoute('/multi-cookie-redirect/')({
+  loader: () => setMultipleCookiesAndRedirect(),
+  component: () => null,
+})

e2e/react-start/basic/src/routes/multi-cookie-redirect/target.tsx

@@ -0,0 +1,39 @@
+import { createFileRoute } from '@tanstack/react-router'
+import Cookies from 'js-cookie'
+import React, { useEffect } from 'react'
+
+export const Route = createFileRoute('/multi-cookie-redirect/target')({
+  component: RouteComponent,
+})
+
+function RouteComponent() {
+  const [cookies, setCookies] = React.useState<Record<string, string>>({})
+
+  useEffect(() => {
+    setCookies({
+      session: Cookies.get('session') || '',
+      csrf: Cookies.get('csrf') || '',
+      theme: Cookies.get('theme') || '',
+    })
+  }, [])
+
+  return (
+    <div>
+      <h1 data-testid="multi-cookie-redirect-target">
+        Multi Cookie Redirect Target
+      </h1>
+      <div>
+        <p>
+          Session cookie:{' '}
+          <span data-testid="cookie-session">{cookies.session}</span>
+        </p>
+        <p>
+          CSRF cookie: <span data-testid="cookie-csrf">{cookies.csrf}</span>
+        </p>
+        <p>
+          Theme cookie: <span data-testid="cookie-theme">{cookies.theme}</span>
+        </p>
+      </div>
+    </div>
+  )
+}

e2e/react-start/basic/tests/redirect.spec.ts

@@ -228,4 +228,23 @@ test.describe('redirects', () => {
       })
     })
   })
+
+  test('multiple Set-Cookie headers are preserved on redirect', async ({
+    page,
+  }) => {
+    // This test verifies that multiple Set-Cookie headers are not lost during redirect
+    await page.goto('/multi-cookie-redirect')
+
+    // Wait for redirect to complete
+    await page.waitForURL(/\/multi-cookie-redirect\/target/)
+
+    // Should redirect to target page
+    await expect(page.getByTestId('multi-cookie-redirect-target')).toBeVisible()
+    expect(page.url()).toContain('/multi-cookie-redirect/target')
+
+    // Verify all three cookies were preserved during the redirect
+    await expect(page.getByTestId('cookie-session')).toHaveText('session-value')
+    await expect(page.getByTestId('cookie-csrf')).toHaveText('csrf-token-value')
+    await expect(page.getByTestId('cookie-theme')).toHaveText('dark')
+  })
 })

e2e/react-start/selective-ssr/src/routes/__root.tsx

@@ -42,13 +42,6 @@ export const Route = createRootRoute({
     }
   },
   beforeLoad: ({ search }) => {
-    if (typeof window !== 'undefined') {
-      if (Route.options.ssr !== undefined) {
-        const error = `ssr() for ${Route.id} should have been deleted from the Route options on the client`
-        console.error(error)
-        throw new Error(error)
-      }
-    }
     console.log(
       `beforeLoad for ${Route.id} called on the ${typeof window !== 'undefined' ? 'client' : 'server'}`,
     )

e2e/react-start/selective-ssr/src/routes/posts.$postId.tsx

@@ -15,13 +15,6 @@ export const Route = createFileRoute('/posts/$postId')({
     }
   },
   beforeLoad: ({ search }) => {
-    if (typeof window !== 'undefined') {
-      if (Route.options.ssr !== undefined) {
-        const error = `ssr() for ${Route.id} should have been deleted from the Route options on the client`
-        console.error(error)
-        throw new Error(error)
-      }
-    }
     console.log(
       `beforeLoad for ${Route.id} called on the ${typeof window !== 'undefined' ? 'client' : 'server'}`,
     )

e2e/react-start/selective-ssr/src/routes/posts.tsx

@@ -15,13 +15,6 @@ export const Route = createFileRoute('/posts')({
     }
   },
   beforeLoad: ({ search }) => {
-    if (typeof window !== 'undefined') {
-      if (Route.options.ssr !== undefined) {
-        const error = `ssr() for ${Route.id} should have been deleted from the Route options on the client`
-        console.error(error)
-        throw new Error(error)
-      }
-    }
     console.log(
       `beforeLoad for ${Route.id} called on the ${typeof window !== 'undefined' ? 'client' : 'server'}`,
     )

e2e/solid-start/basic/package.json

@@ -26,6 +26,7 @@
     "@tanstack/solid-start": "workspace:^",
     "express": "^5.1.0",
     "http-proxy-middleware": "^3.0.5",
+    "js-cookie": "^3.0.5",
     "redaxios": "^0.5.1",
     "solid-js": "^1.9.10",
     "tailwind-merge": "^2.6.0",
@@ -36,6 +37,7 @@
     "@playwright/test": "^1.50.1",
     "@tailwindcss/postcss": "^4.1.15",
     "@tanstack/router-e2e-utils": "workspace:^",
+    "@types/js-cookie": "^3.0.6",
     "@types/node": "^22.10.2",
     "combinate": "^1.1.11",
     "postcss": "^8.5.1",