Skip to content

Commit 2cd6c7a

Browse files
fix: correctly match middleware expressions in compiler plugin filter
fixes #6169
1 parent 6fd9c95 commit 2cd6c7a

5 files changed

Lines changed: 136 additions & 1 deletion

File tree

‎e2e/react-start/server-functions/src/routeTree.gen.ts‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import { Route as CookiesIndexRouteImport } from './routes/cookies/index'
3434
import { Route as AbortSignalIndexRouteImport } from './routes/abort-signal/index'
3535
import { Route as RedirectTestTargetRouteImport } from './routes/redirect-test/target'
3636
import { Route as RedirectTestSsrTargetRouteImport } from './routes/redirect-test-ssr/target'
37+
import { Route as MiddlewareServerImportMiddlewareRouteImport } from './routes/middleware/server-import-middleware'
3738
import { Route as MiddlewareSendServerFnRouteImport } from './routes/middleware/send-serverFn'
3839
import { Route as MiddlewareRequestMiddlewareRouteImport } from './routes/middleware/request-middleware'
3940
import { Route as MiddlewareClientMiddlewareRouterRouteImport } from './routes/middleware/client-middleware-router'
@@ -166,6 +167,12 @@ const RedirectTestSsrTargetRoute = RedirectTestSsrTargetRouteImport.update({
166167
path: '/redirect-test-ssr/target',
167168
getParentRoute: () => rootRouteImport,
168169
} as any)
170+
const MiddlewareServerImportMiddlewareRoute =
171+
MiddlewareServerImportMiddlewareRouteImport.update({
172+
id: '/middleware/server-import-middleware',
173+
path: '/middleware/server-import-middleware',
174+
getParentRoute: () => rootRouteImport,
175+
} as any)
169176
const MiddlewareSendServerFnRoute = MiddlewareSendServerFnRouteImport.update({
170177
id: '/middleware/send-serverFn',
171178
path: '/middleware/send-serverFn',
@@ -221,6 +228,7 @@ export interface FileRoutesByFullPath {
221228
'/middleware/client-middleware-router': typeof MiddlewareClientMiddlewareRouterRoute
222229
'/middleware/request-middleware': typeof MiddlewareRequestMiddlewareRoute
223230
'/middleware/send-serverFn': typeof MiddlewareSendServerFnRoute
231+
'/middleware/server-import-middleware': typeof MiddlewareServerImportMiddlewareRoute
224232
'/redirect-test-ssr/target': typeof RedirectTestSsrTargetRoute
225233
'/redirect-test/target': typeof RedirectTestTargetRoute
226234
'/abort-signal': typeof AbortSignalIndexRoute
@@ -254,6 +262,7 @@ export interface FileRoutesByTo {
254262
'/middleware/client-middleware-router': typeof MiddlewareClientMiddlewareRouterRoute
255263
'/middleware/request-middleware': typeof MiddlewareRequestMiddlewareRoute
256264
'/middleware/send-serverFn': typeof MiddlewareSendServerFnRoute
265+
'/middleware/server-import-middleware': typeof MiddlewareServerImportMiddlewareRoute
257266
'/redirect-test-ssr/target': typeof RedirectTestSsrTargetRoute
258267
'/redirect-test/target': typeof RedirectTestTargetRoute
259268
'/abort-signal': typeof AbortSignalIndexRoute
@@ -288,6 +297,7 @@ export interface FileRoutesById {
288297
'/middleware/client-middleware-router': typeof MiddlewareClientMiddlewareRouterRoute
289298
'/middleware/request-middleware': typeof MiddlewareRequestMiddlewareRoute
290299
'/middleware/send-serverFn': typeof MiddlewareSendServerFnRoute
300+
'/middleware/server-import-middleware': typeof MiddlewareServerImportMiddlewareRoute
291301
'/redirect-test-ssr/target': typeof RedirectTestSsrTargetRoute
292302
'/redirect-test/target': typeof RedirectTestTargetRoute
293303
'/abort-signal/': typeof AbortSignalIndexRoute
@@ -323,6 +333,7 @@ export interface FileRouteTypes {
323333
| '/middleware/client-middleware-router'
324334
| '/middleware/request-middleware'
325335
| '/middleware/send-serverFn'
336+
| '/middleware/server-import-middleware'
326337
| '/redirect-test-ssr/target'
327338
| '/redirect-test/target'
328339
| '/abort-signal'
@@ -356,6 +367,7 @@ export interface FileRouteTypes {
356367
| '/middleware/client-middleware-router'
357368
| '/middleware/request-middleware'
358369
| '/middleware/send-serverFn'
370+
| '/middleware/server-import-middleware'
359371
| '/redirect-test-ssr/target'
360372
| '/redirect-test/target'
361373
| '/abort-signal'
@@ -389,6 +401,7 @@ export interface FileRouteTypes {
389401
| '/middleware/client-middleware-router'
390402
| '/middleware/request-middleware'
391403
| '/middleware/send-serverFn'
404+
| '/middleware/server-import-middleware'
392405
| '/redirect-test-ssr/target'
393406
| '/redirect-test/target'
394407
| '/abort-signal/'
@@ -423,6 +436,7 @@ export interface RootRouteChildren {
423436
MiddlewareClientMiddlewareRouterRoute: typeof MiddlewareClientMiddlewareRouterRoute
424437
MiddlewareRequestMiddlewareRoute: typeof MiddlewareRequestMiddlewareRoute
425438
MiddlewareSendServerFnRoute: typeof MiddlewareSendServerFnRoute
439+
MiddlewareServerImportMiddlewareRoute: typeof MiddlewareServerImportMiddlewareRoute
426440
RedirectTestSsrTargetRoute: typeof RedirectTestSsrTargetRoute
427441
RedirectTestTargetRoute: typeof RedirectTestTargetRoute
428442
AbortSignalIndexRoute: typeof AbortSignalIndexRoute
@@ -613,6 +627,13 @@ declare module '@tanstack/react-router' {
613627
preLoaderRoute: typeof RedirectTestSsrTargetRouteImport
614628
parentRoute: typeof rootRouteImport
615629
}
630+
'/middleware/server-import-middleware': {
631+
id: '/middleware/server-import-middleware'
632+
path: '/middleware/server-import-middleware'
633+
fullPath: '/middleware/server-import-middleware'
634+
preLoaderRoute: typeof MiddlewareServerImportMiddlewareRouteImport
635+
parentRoute: typeof rootRouteImport
636+
}
616637
'/middleware/send-serverFn': {
617638
id: '/middleware/send-serverFn'
618639
path: '/middleware/send-serverFn'
@@ -679,6 +700,7 @@ const rootRouteChildren: RootRouteChildren = {
679700
MiddlewareClientMiddlewareRouterRoute: MiddlewareClientMiddlewareRouterRoute,
680701
MiddlewareRequestMiddlewareRoute: MiddlewareRequestMiddlewareRoute,
681702
MiddlewareSendServerFnRoute: MiddlewareSendServerFnRoute,
703+
MiddlewareServerImportMiddlewareRoute: MiddlewareServerImportMiddlewareRoute,
682704
RedirectTestSsrTargetRoute: RedirectTestSsrTargetRoute,
683705
RedirectTestTargetRoute: RedirectTestTargetRoute,
684706
AbortSignalIndexRoute: AbortSignalIndexRoute,

‎e2e/react-start/server-functions/src/routes/middleware/index.tsx‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@ function RouteComponent() {
3333
Request Middleware in combination with server function
3434
</Route.Link>
3535
</li>
36+
<li>
37+
<Route.Link
38+
to="./server-import-middleware"
39+
data-testid="server-import-middleware-link"
40+
>
41+
Server imports in middleware are stripped from client build
42+
</Route.Link>
43+
</li>
3644
</ul>
3745
</div>
3846
)
Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
import { createFileRoute } from '@tanstack/react-router'
2+
import { createMiddleware, createServerFn } from '@tanstack/react-start'
3+
import { getRequestHeaders } from '@tanstack/react-start/server'
4+
import React from 'react'
5+
6+
/**
7+
* This test verifies that server-only imports (like getRequestHeaders from @tanstack/react-start/server)
8+
* are properly removed from the client bundle when used inside createMiddleware().server().
9+
*
10+
* If the .server() part is not stripped from the client build, this will fail with:
11+
* "Module node:async_hooks has been externalized for browser compatibility"
12+
* because @tanstack/react-start/server uses node:async_hooks internally.
13+
*/
14+
const serverImportMiddleware = createMiddleware({ type: 'function' }).server(
15+
async ({ next }) => {
16+
// Use a server-only import - this should be stripped from client build
17+
const headers = getRequestHeaders()
18+
const testHeader = headers.get('x-test-middleware') ?? 'missing'
19+
20+
console.log('[server-import-middleware] X-Test-Middleware:', testHeader)
21+
22+
return next({
23+
context: {
24+
testHeader,
25+
},
26+
})
27+
},
28+
)
29+
30+
const serverFn = createServerFn()
31+
.middleware([serverImportMiddleware])
32+
.handler(async ({ context }) => {
33+
return { testHeader: context.testHeader }
34+
})
35+
36+
export const Route = createFileRoute('/middleware/server-import-middleware')({
37+
component: RouteComponent,
38+
})
39+
40+
function RouteComponent() {
41+
const [result, setResult] = React.useState<{ testHeader: string } | null>(
42+
null,
43+
)
44+
const [error, setError] = React.useState<string | null>(null)
45+
46+
async function handleClick() {
47+
try {
48+
const data = await serverFn({
49+
headers: { 'x-test-middleware': 'test-header-value' },
50+
})
51+
setResult(data)
52+
setError(null)
53+
} catch (e) {
54+
setResult(null)
55+
setError(e instanceof Error ? e.message : String(e))
56+
}
57+
}
58+
59+
return (
60+
<div>
61+
<h2>Server Import in Middleware Test</h2>
62+
<p>
63+
This test verifies that server-only imports (getRequestHeaders) inside
64+
createMiddleware().server() are properly stripped from the client build.
65+
</p>
66+
<button
67+
onClick={handleClick}
68+
data-testid="test-server-import-middleware-btn"
69+
>
70+
Call server function with middleware
71+
</button>
72+
{result && (
73+
<div data-testid="server-import-middleware-result">
74+
{result.testHeader}
75+
</div>
76+
)}
77+
{error && (
78+
<div data-testid="server-import-middleware-error">Error: {error}</div>
79+
)}
80+
</div>
81+
)
82+
}

‎e2e/react-start/server-functions/tests/server-functions.spec.ts‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -615,3 +615,23 @@ test('nested star re-exported server function factory middleware executes correc
615615
page.getByTestId('fn-comparison-nestedReexportedFactoryFn'),
616616
).toContainText('equal')
617617
})
618+
619+
test('server-only imports in middleware.server() are stripped from client build', async ({
620+
page,
621+
}) => {
622+
// This test verifies that server-only imports (like getRequestHeaders from @tanstack/react-start/server)
623+
// inside createMiddleware().server() are properly stripped from the client build.
624+
// If the .server() part is not removed, the build would fail with node:async_hooks externalization errors.
625+
// The fact that this page loads at all proves the server code was stripped correctly.
626+
await page.goto('/middleware/server-import-middleware')
627+
628+
await page.waitForLoadState('networkidle')
629+
630+
// Click the button to call the server function with middleware
631+
await page.getByTestId('test-server-import-middleware-btn').click()
632+
633+
// Wait for the result - should contain our custom test header value
634+
await expect(
635+
page.getByTestId('server-import-middleware-result'),
636+
).toContainText('test-header-value')
637+
})

‎packages/start-plugin-core/src/create-server-fn-plugin/plugin.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,12 @@ export function createServerFnPlugin(opts: {
5757
type: 'client' | 'server'
5858
}): PluginOption {
5959
// in server environments, we don't transform middleware calls
60+
// for client environments, we need to match:
61+
// - `.handler(` for createServerFn
62+
// - `.server(` for createMiddleware
6063
const transformCodeFilter =
6164
environment.type === 'client'
62-
? [/\.\s*handler\(/, /\.\s*createMiddleware\(\)/]
65+
? [/\.\s*handler\(/, /\.\s*server\(/]
6366
: [/\.\s*handler\(/]
6467

6568
return {

0 commit comments

Comments
 (0)