Skip to content

Keep non-ServerComponent exports as client components #14408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
+78 −248
Open

Keep non-ServerComponent exports as client components #14408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfe7442
Keep non-ServerComponent exports as client components
markdalgleish Oct 2, 2025
1942dc7
Remove redundant `&` in types
markdalgleish Oct 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/gorgeous-panthers-hug.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@react-router/dev": patch
"react-router": patch
---

In (unstable) RSC Framework Mode, always keep the `ErrorBoundary`, `HydrateFallback` and `Layout` Route Module exports as client components, even when a `ServerComponent` export is present
6 changes: 3 additions & 3 deletions docs/how-to/react-server-components.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ The quickest way to get started is with one of our templates.

These templates come with React Router RSC APIs already configured, offering you out of the box features such as:

- Server Component Routes
- Server Side Rendering (SSR)
- Server Components
- Client Components (via [`"use client"`][use-client-docs] directive)
- Server Functions (via [`"use server"`][use-server-docs] directive)

Expand Down Expand Up @@ -177,9 +177,9 @@ export default function Route({
}
```

### Server Component Routes
### Route Server Components

If a route exports a `ServerComponent` instead of the typical `default` component export, this component along with other route components (`ErrorBoundary`, `HydrateFallback`, `Layout`) will be server components rather than the usual client components.
If a route exports a `ServerComponent` instead of the typical `default` component export, this will be a server component rather than the usual client component.

```tsx
import type { Route } from "./+types/route";
Expand Down
98 changes: 1 addition & 97 deletions integration/typegen-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@ test.describe("typegen", () => {
});
});

test.describe("server-first route component detection", () => {
test.describe("route server component detection", () => {
test.describe("ServerComponent export", () => {
test("when RSC Framework Mode plugin is present", async ({ edit, $ }) => {
await edit({
Expand Down Expand Up @@ -706,38 +706,6 @@ test.describe("typegen", () => {
</>
)
}

export function ErrorBoundary({
loaderData,
actionData
}: Route.ErrorBoundaryProps) {
type TestLoaderData = Expect<Equal<typeof loaderData, { server: string } | undefined>>
type TestActionData = Expect<Equal<typeof actionData, { server: string } | undefined>>

return (
<>
<h1>ErrorBoundary</h1>
<p>Loader data: {loaderData?.server}</p>
<p>Action data: {actionData?.server}</p>
</>
)
}

export function HydrateFallback({
loaderData,
actionData
}: Route.HydrateFallbackProps) {
type TestLoaderData = Expect<Equal<typeof loaderData, { server: string } | undefined>>
type TestActionData = Expect<Equal<typeof actionData, { server: string } | undefined>>

return (
<>
<h1>HydrateFallback</h1>
<p>Loader data: {loaderData?.server}</p>
<p>Action data: {actionData?.server}</p>
</>
)
}
`,
});
await $("pnpm typecheck");
Expand Down Expand Up @@ -795,38 +763,6 @@ test.describe("typegen", () => {
</>
)
}

export function ErrorBoundary({
loaderData,
actionData
}: Route.ErrorBoundaryProps) {
type TestLoaderData = Expect<Equal<typeof loaderData, { server: string } | { client: string } | undefined>>
type TestActionData = Expect<Equal<typeof actionData, { server: string } | { client: string } | undefined>>

return (
<>
<h1>ErrorBoundary</h1>
{loaderData && <p>Loader data: {"server" in loaderData ? loaderData.server : loaderData.client}</p>}
{actionData && <p>Action data: {"server" in actionData ? actionData.server : actionData.client}</p>}
</>
)
}

export function HydrateFallback({
loaderData,
actionData
}: Route.HydrateFallbackProps) {
type TestLoaderData = Expect<Equal<typeof loaderData, { server: string } | { client: string } | undefined>>
type TestActionData = Expect<Equal<typeof actionData, { server: string } | { client: string } | undefined>>

return (
<>
<h1>HydrateFallback</h1>
{loaderData && <p>Loader data: {"server" in loaderData ? loaderData.server : loaderData.client}</p>}
{actionData && <p>Action data: {"server" in actionData ? actionData.server : actionData.client}</p>}
</>
)
}
`,
});
await $("pnpm typecheck");
Expand Down Expand Up @@ -878,38 +814,6 @@ test.describe("typegen", () => {
</>
)
}

export function ErrorBoundary({
loaderData,
actionData
}: Route.ErrorBoundaryProps) {
type TestLoaderData = Expect<Equal<typeof loaderData, { server: string } | { client: string } | undefined>>
type TestActionData = Expect<Equal<typeof actionData, { server: string } | { client: string } | undefined>>

return (
<>
<h1>ErrorBoundary</h1>
{loaderData && <p>Loader data: {"server" in loaderData ? loaderData.server : loaderData.client}</p>}
{actionData && <p>Action data: {"server" in actionData ? actionData.server : actionData.client}</p>}
</>
)
}

export function HydrateFallback({
loaderData,
actionData
}: Route.HydrateFallbackProps) {
type TestLoaderData = Expect<Equal<typeof loaderData, { server: string } | { client: string } | undefined>>
type TestActionData = Expect<Equal<typeof actionData, { server: string } | { client: string } | undefined>>

return (
<>
<h1>HydrateFallback</h1>
{loaderData && <p>Loader data: {"server" in loaderData ? loaderData.server : loaderData.client}</p>}
{actionData && <p>Action data: {"server" in actionData ? actionData.server : actionData.client}</p>}
</>
)
}
`,
};

Expand Down
Loading