Skip to content

Commit ae453b7

Browse files
feat: rsc css (#7310)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
1 parent 2c9f5c0 commit ae453b7

32 files changed

Lines changed: 1429 additions & 114 deletions
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
'@tanstack/react-start': patch
3+
'@tanstack/react-start-rsc': patch
4+
'@tanstack/start-plugin-core': patch
5+
---
6+
7+
Add compiler-driven RSC CSS auto-injection for Start RSC render APIs and wire it into the React Start Vite and Rsbuild adapters. This ensures same-file CSS module dependencies are discovered for `renderServerComponent`, `createCompositeComponent`, and JSX-based `renderToReadableStream` calls.
8+
9+
Also add a configurable server function provider module directive hook used by the React Rsbuild RSC adapter to emit `"use server-entry"` only for extracted provider files.

‎e2e/react-start/rsc/src/routeTree.gen.ts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ import { Route as RscDeferredComponentRouteImport } from './routes/rsc-deferred-
4242
import { Route as RscDeferredRouteImport } from './routes/rsc-deferred'
4343
import { Route as RscCssPreloadComplexRouteImport } from './routes/rsc-css-preload-complex'
4444
import { Route as RscCssModulesRouteImport } from './routes/rsc-css-modules'
45+
import { Route as RscCssAutoinjectRouteImport } from './routes/rsc-css-autoinject'
4546
import { Route as RscContextRouteImport } from './routes/rsc-context'
4647
import { Route as RscComponentSlotRouteImport } from './routes/rsc-component-slot'
4748
import { Route as RscClientPreloadRouteImport } from './routes/rsc-client-preload'
@@ -221,6 +222,11 @@ const RscCssModulesRoute = RscCssModulesRouteImport.update({
221222
path: '/rsc-css-modules',
222223
getParentRoute: () => rootRouteImport,
223224
} as any)
225+
const RscCssAutoinjectRoute = RscCssAutoinjectRouteImport.update({
226+
id: '/rsc-css-autoinject',
227+
path: '/rsc-css-autoinject',
228+
getParentRoute: () => rootRouteImport,
229+
} as any)
224230
const RscContextRoute = RscContextRouteImport.update({
225231
id: '/rsc-context',
226232
path: '/rsc-context',
@@ -296,6 +302,7 @@ export interface FileRoutesByFullPath {
296302
'/rsc-client-preload': typeof RscClientPreloadRoute
297303
'/rsc-component-slot': typeof RscComponentSlotRoute
298304
'/rsc-context': typeof RscContextRoute
305+
'/rsc-css-autoinject': typeof RscCssAutoinjectRoute
299306
'/rsc-css-modules': typeof RscCssModulesRoute
300307
'/rsc-css-preload-complex': typeof RscCssPreloadComplexRoute
301308
'/rsc-deferred': typeof RscDeferredRoute
@@ -344,6 +351,7 @@ export interface FileRoutesByTo {
344351
'/rsc-client-preload': typeof RscClientPreloadRoute
345352
'/rsc-component-slot': typeof RscComponentSlotRoute
346353
'/rsc-context': typeof RscContextRoute
354+
'/rsc-css-autoinject': typeof RscCssAutoinjectRoute
347355
'/rsc-css-modules': typeof RscCssModulesRoute
348356
'/rsc-css-preload-complex': typeof RscCssPreloadComplexRoute
349357
'/rsc-deferred': typeof RscDeferredRoute
@@ -393,6 +401,7 @@ export interface FileRoutesById {
393401
'/rsc-client-preload': typeof RscClientPreloadRoute
394402
'/rsc-component-slot': typeof RscComponentSlotRoute
395403
'/rsc-context': typeof RscContextRoute
404+
'/rsc-css-autoinject': typeof RscCssAutoinjectRoute
396405
'/rsc-css-modules': typeof RscCssModulesRoute
397406
'/rsc-css-preload-complex': typeof RscCssPreloadComplexRoute
398407
'/rsc-deferred': typeof RscDeferredRoute
@@ -443,6 +452,7 @@ export interface FileRouteTypes {
443452
| '/rsc-client-preload'
444453
| '/rsc-component-slot'
445454
| '/rsc-context'
455+
| '/rsc-css-autoinject'
446456
| '/rsc-css-modules'
447457
| '/rsc-css-preload-complex'
448458
| '/rsc-deferred'
@@ -491,6 +501,7 @@ export interface FileRouteTypes {
491501
| '/rsc-client-preload'
492502
| '/rsc-component-slot'
493503
| '/rsc-context'
504+
| '/rsc-css-autoinject'
494505
| '/rsc-css-modules'
495506
| '/rsc-css-preload-complex'
496507
| '/rsc-deferred'
@@ -539,6 +550,7 @@ export interface FileRouteTypes {
539550
| '/rsc-client-preload'
540551
| '/rsc-component-slot'
541552
| '/rsc-context'
553+
| '/rsc-css-autoinject'
542554
| '/rsc-css-modules'
543555
| '/rsc-css-preload-complex'
544556
| '/rsc-deferred'
@@ -588,6 +600,7 @@ export interface RootRouteChildren {
588600
RscClientPreloadRoute: typeof RscClientPreloadRoute
589601
RscComponentSlotRoute: typeof RscComponentSlotRoute
590602
RscContextRoute: typeof RscContextRoute
603+
RscCssAutoinjectRoute: typeof RscCssAutoinjectRoute
591604
RscCssModulesRoute: typeof RscCssModulesRoute
592605
RscCssPreloadComplexRoute: typeof RscCssPreloadComplexRoute
593606
RscDeferredRoute: typeof RscDeferredRoute
@@ -861,6 +874,13 @@ declare module '@tanstack/react-router' {
861874
preLoaderRoute: typeof RscCssModulesRouteImport
862875
parentRoute: typeof rootRouteImport
863876
}
877+
'/rsc-css-autoinject': {
878+
id: '/rsc-css-autoinject'
879+
path: '/rsc-css-autoinject'
880+
fullPath: '/rsc-css-autoinject'
881+
preLoaderRoute: typeof RscCssAutoinjectRouteImport
882+
parentRoute: typeof rootRouteImport
883+
}
864884
'/rsc-context': {
865885
id: '/rsc-context'
866886
path: '/rsc-context'
@@ -964,6 +984,7 @@ const rootRouteChildren: RootRouteChildren = {
964984
RscClientPreloadRoute: RscClientPreloadRoute,
965985
RscComponentSlotRoute: RscComponentSlotRoute,
966986
RscContextRoute: RscContextRoute,
987+
RscCssAutoinjectRoute: RscCssAutoinjectRoute,
967988
RscCssModulesRoute: RscCssModulesRoute,
968989
RscCssPreloadComplexRoute: RscCssPreloadComplexRoute,
969990
RscDeferredRoute: RscDeferredRoute,

‎e2e/react-start/rsc/src/routes/__root.tsx‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,14 @@ function RootComponent() {
352352
>
353353
CSS Preload Complex
354354
</Link>
355+
<Link
356+
to="/rsc-css-autoinject"
357+
className="nav-link"
358+
activeProps={{ className: 'nav-link active' }}
359+
data-testid="nav-css-autoinject"
360+
>
361+
CSS Auto Inject
362+
</Link>
355363
<Link
356364
to="/rsc-param"
357365
className="nav-link"
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
.card {
2+
padding: 16px;
3+
border: 3px solid #0f766e;
4+
border-radius: 14px;
5+
background: #ccfbf1;
6+
color: #134e4a;
7+
box-shadow: 0 8px 20px rgb(15 118 110 / 0.18);
8+
}
9+
10+
.renderable {
11+
border-color: #2563eb;
12+
}
13+
14+
.composite {
15+
border-color: #9333ea;
16+
}
17+
18+
.flight {
19+
border-color: #ea580c;
20+
}
21+
22+
.badge {
23+
display: inline-block;
24+
margin-bottom: 8px;
25+
padding: 3px 8px;
26+
border-radius: 999px;
27+
background: #0f766e;
28+
color: white;
29+
font-size: 12px;
30+
font-weight: 700;
31+
letter-spacing: 0.08em;
32+
text-transform: uppercase;
33+
}
34+
35+
.title {
36+
margin: 0 0 4px;
37+
font-size: 18px;
38+
}
39+
40+
.description {
41+
margin: 0;
42+
font-size: 14px;
43+
}
Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
import * as React from 'react'
2+
import { createFileRoute } from '@tanstack/react-router'
3+
import { createServerFn } from '@tanstack/react-start'
4+
import {
5+
CompositeComponent,
6+
createCompositeComponent,
7+
createFromFetch,
8+
renderServerComponent,
9+
renderToReadableStream,
10+
} from '@tanstack/react-start/rsc'
11+
import styles from './rsc-css-autoinject.module.css'
12+
import { pageStyles } from '~/utils/styles'
13+
14+
type CardKind = 'renderable' | 'composite' | 'flight'
15+
16+
function SameFileCssModuleCard({
17+
kind,
18+
label,
19+
}: {
20+
kind: CardKind
21+
label: string
22+
}) {
23+
return (
24+
<section
25+
className={`${styles.card} ${styles[kind]}`}
26+
data-testid={`rsc-css-autoinject-${kind}`}
27+
>
28+
<span className={styles.badge}>auto injected css</span>
29+
<h2 className={styles.title}>{label}</h2>
30+
<p className={styles.description}>
31+
This server component is defined in the same route file as the RSC
32+
render call and uses a CSS module from that route file.
33+
</p>
34+
</section>
35+
)
36+
}
37+
38+
const getRenderableCssModule = createServerFn({ method: 'GET' }).handler(
39+
async () => {
40+
return renderServerComponent(
41+
<SameFileCssModuleCard
42+
kind="renderable"
43+
label="renderServerComponent CSS"
44+
/>,
45+
)
46+
},
47+
)
48+
49+
const getCompositeCssModule = createServerFn({ method: 'GET' }).handler(
50+
async () => {
51+
return createCompositeComponent(() => ({
52+
Card: (
53+
<SameFileCssModuleCard
54+
kind="composite"
55+
label="createCompositeComponent CSS"
56+
/>
57+
),
58+
}))
59+
},
60+
)
61+
62+
const getFlightCssModuleResponse = createServerFn({ method: 'GET' }).handler(
63+
async () => {
64+
const stream = renderToReadableStream(
65+
<SameFileCssModuleCard
66+
kind="flight"
67+
label="renderToReadableStream CSS"
68+
/>,
69+
)
70+
71+
return new Response(stream, {
72+
headers: {
73+
'Content-Type': 'text/x-component',
74+
},
75+
})
76+
},
77+
)
78+
79+
export const Route = createFileRoute('/rsc-css-autoinject')({
80+
loader: async () => {
81+
const [renderable, composite] = await Promise.all([
82+
getRenderableCssModule(),
83+
getCompositeCssModule(),
84+
])
85+
86+
return { renderable, composite }
87+
},
88+
component: RscCssAutoinjectComponent,
89+
})
90+
91+
function RscCssAutoinjectComponent() {
92+
const { renderable, composite } = Route.useLoaderData()
93+
94+
return (
95+
<div style={pageStyles.container} data-testid="rsc-css-autoinject-page">
96+
<h1 style={pageStyles.title}>RSC CSS Auto Injection</h1>
97+
<p style={pageStyles.description}>
98+
This route verifies Start injects RSC CSS resources for same-file CSS
99+
module server components across all Start RSC render APIs.
100+
</p>
101+
102+
<div style={{ display: 'grid', gap: '16px' }}>
103+
{renderable}
104+
<CompositeComponent src={composite.Card} />
105+
<FlightCssModuleCard />
106+
</div>
107+
</div>
108+
)
109+
}
110+
111+
function FlightCssModuleCard() {
112+
const [node, setNode] = React.useState<React.ReactNode>(null)
113+
const [error, setError] = React.useState<string | null>(null)
114+
115+
React.useEffect(() => {
116+
let cancelled = false
117+
118+
async function loadFlightCard() {
119+
try {
120+
const response = await getFlightCssModuleResponse()
121+
const result = await createFromFetch(Promise.resolve(response))
122+
if (!cancelled) {
123+
setNode(result)
124+
}
125+
} catch (e) {
126+
if (!cancelled) {
127+
setError(e instanceof Error ? e.message : String(e))
128+
}
129+
}
130+
}
131+
132+
loadFlightCard()
133+
134+
return () => {
135+
cancelled = true
136+
}
137+
}, [])
138+
139+
if (error) {
140+
return <div data-testid="rsc-css-autoinject-flight-error">{error}</div>
141+
}
142+
143+
return <>{node}</>
144+
}
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import { expect } from '@playwright/test'
2+
import { test } from '@tanstack/router-e2e-utils'
3+
import { waitForHydration } from './hydration'
4+
5+
test.describe('RSC CSS Auto Injection Tests', () => {
6+
test('same-file CSS modules are auto-injected for all RSC render APIs', async ({
7+
page,
8+
}) => {
9+
await page.goto('/rsc-css-autoinject')
10+
await page.waitForURL('/rsc-css-autoinject')
11+
await waitForHydration(page)
12+
13+
const renderable = page.getByTestId('rsc-css-autoinject-renderable')
14+
const composite = page.getByTestId('rsc-css-autoinject-composite')
15+
const flight = page.getByTestId('rsc-css-autoinject-flight')
16+
17+
await expect(renderable).toBeVisible()
18+
await expect(composite).toBeVisible()
19+
await expect(flight).toBeVisible()
20+
21+
for (const card of [renderable, composite, flight]) {
22+
await expect(card).toHaveCSS('background-color', 'rgb(204, 251, 241)')
23+
await expect(card).toHaveCSS('border-radius', '14px')
24+
}
25+
26+
const html = await page.content()
27+
expect(html).toContain('data-rsc-css-href')
28+
})
29+
})

‎packages/react-start-rsc/package.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,12 @@
6969
"default": "./dist/esm/plugin/vite.js"
7070
}
7171
},
72+
"./plugin/rscCssTransform": {
73+
"import": {
74+
"types": "./dist/esm/src/plugin/rscCssTransform.d.ts",
75+
"default": "./dist/esm/plugin/rscCssTransform.js"
76+
}
77+
},
7278
"./rsbuild/ssr-decode": {
7379
"import": {
7480
"types": "./dist/esm/src/rsbuild/ssr-decode.d.ts",

‎packages/react-start-rsc/src/createCompositeComponent.ts‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@ import {
99
RSC_SLOT_USAGES_STREAM,
1010
SERVER_COMPONENT_STREAM,
1111
} from './ServerComponentTypes'
12+
import { createRscCssEnvelope } from './rscCssEnvelope'
1213
import type {
1314
AnyCompositeComponent,
1415
CompositeComponentResult,
1516
RscSlotUsageEvent,
1617
ServerComponentStream,
1718
ValidateCompositeComponent,
1819
} from './ServerComponentTypes'
20+
import type { RscCssEnvelopeOptions } from './rscCssEnvelope'
1921

2022
import './rscSsrHandler' // Import for global declaration side effect
2123

@@ -51,6 +53,7 @@ import './rscSsrHandler' // Import for global declaration side effect
5153
*/
5254
export async function createCompositeComponent<TComp>(
5355
component: ValidateCompositeComponent<TComp>,
56+
options?: RscCssEnvelopeOptions,
5457
): Promise<CompositeComponentResult<TComp>> {
5558
const isDev = process.env.NODE_ENV === 'development'
5659

@@ -76,14 +79,17 @@ export async function createCompositeComponent<TComp>(
7679

7780
// Wrapper that renders the user's component inside Flight render context
7881
async function ServerComponentWrapper() {
79-
return (component as React.FC)(proxyProps)
82+
return createRscCssEnvelope(
83+
await (component as React.FC)(proxyProps),
84+
options,
85+
)
8086
}
8187

8288
// Render using createElement so React calls our component during Flight rendering
8389
// This is critical for React.cache to work - the component must be invoked
8490
// during renderToReadableStream's execution, not before
8591
const flightStream = renderToReadableStream(
86-
createElement(ServerComponentWrapper),
92+
createElement(ServerComponentWrapper as any),
8793
)
8894

8995
// Check if this is an SSR request (router) or a direct server function call

0 commit comments

Comments
 (0)