Merge branch 'main' into route-with-server

Author: DeTuksa

e2e/react-start/basic/src/routes/users.$userId.tsx

@@ -1,14 +1,16 @@
 import { ErrorComponent, createFileRoute } from '@tanstack/react-router'
 import axios from 'redaxios'
+import { getRouterInstance } from '@tanstack/react-start'
 import type { ErrorComponentProps } from '@tanstack/react-router'
 
 import type { User } from '~/utils/users'
 import { NotFound } from '~/components/NotFound'
 
 export const Route = createFileRoute('/users/$userId')({
   loader: async ({ params: { userId } }) => {
+    const router = await getRouterInstance()
     return await axios
-      .get<User>('/api/users/' + userId)
+      .get<User>('/api/users/' + userId, { baseURL: router.options.origin })
       .then((r) => r.data)
       .catch(() => {
         throw new Error('Failed to fetch user')

e2e/react-start/basic/src/routes/users.tsx

@@ -1,12 +1,14 @@
 import { Link, Outlet, createFileRoute } from '@tanstack/react-router'
+import { getRouterInstance } from '@tanstack/react-start'
 import axios from 'redaxios'
 
 import type { User } from '~/utils/users'
 
 export const Route = createFileRoute('/users')({
   loader: async () => {
+    const router = await getRouterInstance()
     return await axios
-      .get<Array<User>>('/api/users')
+      .get<Array<User>>('/api/users', { baseURL: router.options.origin })
       .then((r) => r.data)
       .catch(() => {
         throw new Error('Failed to fetch users')

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

@@ -14,7 +14,6 @@ test.describe('Prerender Static Path Discovery', () => {
       // These static routes should be automatically discovered and prerendered
       expect(existsSync(join(distDir, 'index.html'))).toBe(true)
       expect(existsSync(join(distDir, 'posts/index.html'))).toBe(true)
-      expect(existsSync(join(distDir, 'users/index.html'))).toBe(true)
       expect(existsSync(join(distDir, 'deferred/index.html'))).toBe(true)
       expect(existsSync(join(distDir, 'scripts/index.html'))).toBe(true)
       expect(existsSync(join(distDir, 'inline-scripts/index.html'))).toBe(true)
@@ -40,14 +39,5 @@ test.describe('Prerender Static Path Discovery', () => {
       const html = readFileSync(join(distDir, 'posts/index.html'), 'utf-8')
       expect(html).toContain('Select a post.')
     })
-
-    test('should contain prerendered content in users.html', () => {
-      const distDir = join(process.cwd(), 'dist', 'client')
-      expect(existsSync(join(distDir, 'users/index.html'))).toBe(true)
-
-      // "Select a user." should be in the prerendered HTML
-      const html = readFileSync(join(distDir, 'users/index.html'), 'utf-8')
-      expect(html).toContain('Select a user.')
-    })
   })
 })

e2e/react-start/basic/vite.config.ts

@@ -21,6 +21,7 @@ const prerenderConfiguration = {
       '/i-do-not-exist',
       '/not-found/via-beforeLoad',
       '/not-found/via-loader',
+      '/users',
     ].some((p) => page.path.includes(p)),
   maxRedirects: 100,
 }
@@ -33,7 +34,6 @@ export default defineConfig({
     tsConfigPaths({
       projects: ['./tsconfig.json'],
     }),
-    // @ts-ignore we want to keep one test with verboseFileRoutes off even though the option is hidden
     tanstackStart({
       spa: isSpaMode ? spaModeConfiguration : undefined,
       prerender: isPrerender ? prerenderConfiguration : undefined,

e2e/solid-start/basic/src/routes/users.$userId.tsx

@@ -1,14 +1,16 @@
 import { createFileRoute } from '@tanstack/solid-router'
 import axios from 'redaxios'
 
+import { getRouterInstance } from '@tanstack/solid-start'
 import type { User } from '~/utils/users'
 import { NotFound } from '~/components/NotFound'
 import { UserErrorComponent } from '~/components/UserErrorComponent'
 
 export const Route = createFileRoute('/users/$userId')({
   loader: async ({ params: { userId } }) => {
+    const router = await getRouterInstance()
     return await axios
-      .get<User>('/api/users/' + userId)
+      .get<User>('/api/users/' + userId, { baseURL: router.options.origin })
       .then((r) => r.data)
       .catch(() => {
         throw new Error('Failed to fetch user')

e2e/solid-start/basic/src/routes/users.tsx

@@ -1,12 +1,14 @@
 import { Link, Outlet, createFileRoute } from '@tanstack/solid-router'
+import { getRouterInstance } from '@tanstack/solid-start'
 import axios from 'redaxios'
 
 import type { User } from '~/utils/users'
 
 export const Route = createFileRoute('/users')({
   loader: async () => {
+    const router = await getRouterInstance()
     return await axios
-      .get<Array<User>>('/api/users')
+      .get<Array<User>>('/api/users', { baseURL: router.options.origin })
       .then((r) => r.data)
       .catch(() => {
         throw new Error('Failed to fetch users')

e2e/solid-start/basic/tests/prerendering.spec.ts

@@ -14,7 +14,6 @@ test.describe('Prerender Static Path Discovery', () => {
       // These static routes should be automatically discovered and prerendered
       expect(existsSync(join(distDir, 'index.html'))).toBe(true)
       expect(existsSync(join(distDir, 'posts/index.html'))).toBe(true)
-      expect(existsSync(join(distDir, 'users/index.html'))).toBe(true)
       expect(existsSync(join(distDir, 'deferred/index.html'))).toBe(true)
       expect(existsSync(join(distDir, 'scripts/index.html'))).toBe(true)
       expect(existsSync(join(distDir, 'inline-scripts/index.html'))).toBe(true)
@@ -40,14 +39,5 @@ test.describe('Prerender Static Path Discovery', () => {
       const html = readFileSync(join(distDir, 'posts/index.html'), 'utf-8')
       expect(html).toContain('Select a post.')
     })
-
-    test('should contain prerendered content in users.html', () => {
-      const distDir = join(process.cwd(), 'dist', 'client')
-      expect(existsSync(join(distDir, 'users/index.html'))).toBe(true)
-
-      // "Select a user." should be in the prerendered HTML
-      const html = readFileSync(join(distDir, 'users/index.html'), 'utf-8')
-      expect(html).toContain('Select a user.')
-    })
   })
 })

e2e/solid-start/basic/vite.config.ts

@@ -23,6 +23,7 @@ const prerenderConfiguration = {
       '/not-found/via-loader',
       '/search-params/default',
       '/transition',
+      '/users',
     ].some((p) => page.path.includes(p)),
   maxRedirects: 100,
 }
@@ -35,7 +36,6 @@ export default defineConfig({
     tsConfigPaths({
       projects: ['./tsconfig.json'],
     }),
-    // @ts-ignore we want to keep one test with verboseFileRoutes off even though the option is hidden
     tanstackStart({
       spa: isSpaMode ? spaModeConfiguration : undefined,
       prerender: isPrerender ? prerenderConfiguration : undefined,

examples/react/authenticated-routes-firebase/package.json

@@ -10,9 +10,9 @@
   },
   "dependencies": {
     "@tailwindcss/postcss": "^4.1.15",
-    "@tanstack/react-router": "^1.136.8",
-    "@tanstack/react-router-devtools": "^1.136.8",
-    "@tanstack/router-plugin": "^1.136.8",
+    "@tanstack/react-router": "^1.136.11",
+    "@tanstack/react-router-devtools": "^1.136.11",
+    "@tanstack/router-plugin": "^1.136.11",
     "firebase": "^11.4.0",
     "postcss": "^8.5.1",
     "react": "^19.0.0",

examples/react/authenticated-routes/package.json

@@ -10,9 +10,9 @@
   },
   "dependencies": {
     "@tailwindcss/postcss": "^4.1.15",
-    "@tanstack/react-router": "^1.136.8",
-    "@tanstack/react-router-devtools": "^1.136.8",
-    "@tanstack/router-plugin": "^1.136.8",
+    "@tanstack/react-router": "^1.136.11",
+    "@tanstack/react-router-devtools": "^1.136.11",
+    "@tanstack/router-plugin": "^1.136.11",
     "postcss": "^8.5.1",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",