Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/use-remix-node-fetch-server.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"rsbuild-plugin-react-router": patch
---

Use `@remix-run/node-fetch-server` for the built-in dev server middleware to reduce direct reliance on `@mjackson/node-fetch-server`.
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
"@babel/traverse": "^7.28.6",
"@babel/types": "^7.28.6",
"@react-router/node": "^7.13.0",
"@remix-run/node-fetch-server": "^0.13.0",
"@rspack/plugin-react-refresh": "^1.6.0",
"babel-dead-code-elimination": "^1.0.12",
"esbuild": "^0.27.2",
Expand All @@ -89,15 +90,15 @@
"@rsbuild/core": "1.7.2",
"@rslib/core": "^0.19.3",
"@rspack/core": "1.7.4",
"@rstest/core": "^0.8.1",
"@rstest/coverage-istanbul": "^0.2.0",
"@types/babel__core": "^7.20.5",
"@types/babel__generator": "^7.27.0",
"@types/babel__traverse": "^7.28.0",
"@types/fs-extra": "11.0.4",
"@types/jsesc": "^3.0.3",
"@types/node": "^25.0.10",
"@types/react": "^19.2.10",
"@rstest/core": "^0.8.1",
"@rstest/coverage-istanbul": "^0.2.0",
"@types/react-dom": "^19.2.3",
"es-module-lexer": "1.7.0",
"kill-port": "^2.0.1",
Expand Down
7 changes: 5 additions & 2 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 22 additions & 2 deletions src/dev-server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,30 @@ export const createDevServerMiddleware = (server: any): DevServerMiddleware => {
throw new Error('Server bundle not found or invalid');
}

const { createRequestListener } = await import('@react-router/node');
// Use the modern request listener implementation directly to reduce
// our reliance on the deprecated `@mjackson/node-fetch-server` package.
const rr = await import('react-router');
const nfs = await import('@remix-run/node-fetch-server');
if (typeof rr.createRequestHandler !== 'function') {
throw new Error(
'[rsbuild-plugin-react-router] Missing `createRequestHandler` export from `react-router`'
);
}
if (typeof nfs.createRequestListener !== 'function') {
throw new Error(
'[rsbuild-plugin-react-router] Missing `createRequestListener` export from `@remix-run/node-fetch-server`'
);
}
const normalizedBuild = normalizeBuildModule(bundle);
const build = await resolveBuildExports(normalizedBuild);
const listener = createRequestListener({ build });
const requestHandler = rr.createRequestHandler(build, 'development');
// `createRequestListener` provides `client` info but React Router's
// request handler expects an app-defined `loadContext` object.
// For the built-in dev middleware we don't currently provide a load
// context, so pass `undefined`.
const listener = nfs.createRequestListener((request) =>
requestHandler(request)
);
await listener(req, res);
} catch (error) {
console.error('SSR Error:', error);
Expand Down
Loading