Skip to content
Open
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/add-fetch-handler-export.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@react-router/dev": minor
---

Add `@react-router/dev/config/default-fetch-handler` package export that provides a default fetch handler for the server build.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"serialize-javascript": "^6.0.1"
},
"devDependencies": {
"@cloudflare/vite-plugin": "^1.9.0",
"@cloudflare/vite-plugin": "^1.24.0",
"@react-router/dev": "workspace:*",
"@react-router/fs-routes": "workspace:*",
"@types/node": "^20.0.0",
Expand All @@ -29,7 +29,7 @@
"typescript": "catalog:",
"vite": "^6.3.0",
"vite-tsconfig-paths": "^4.2.1",
"wrangler": "^4.23.0"
"wrangler": "^4.64.0"
},
"engines": {
"node": ">=20.0.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"app/**/*",
"app/**/.server/**/*",
"app/**/.client/**/*",
"workers/**/*",
"worker-configuration.d.ts"
],
"compilerOptions": {
Expand Down
27 changes: 0 additions & 27 deletions integration/helpers/vite-plugin-cloudflare-template/workers/app.ts

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "react-router-app"
compatibility_date = "2025-03-17"
main = "./workers/app.ts"
main = "@react-router/dev/config/default-fetch-handler"

assets = {}

Expand Down
5 changes: 3 additions & 2 deletions integration/vite-plugin-cloudflare-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ function defineFiles({
});
`,
"app/routes/env.tsx": tsx`
import { env } from "cloudflare:workers";
import type { Route } from "./+types/env";
export function loader({ context }: Route.LoaderArgs) {
return { message: context.cloudflare.env.VALUE_FROM_CLOUDFLARE };
export function loader() {
return { message: env.VALUE_FROM_CLOUDFLARE };
Comment on lines +27 to +30
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are using the importable env from the runtime module as the default fetch handler is runtime agnostic.

There is no context being passed through.

}
export default function EnvRoute({ loaderData }: Route.RouteComponentProps) {
return <div data-loader-message>{loaderData.message}</div>;
Expand Down
13 changes: 13 additions & 0 deletions packages/react-router-dev/config/default-fetch-handler.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { createRequestHandler } from "react-router";

const handler = createRequestHandler(
// @ts-expect-error - no types for this
() => import("virtual:react-router/server-build"),
import.meta.env.MODE,
);

export default {
async fetch(request: Request) {
return handler(request);
},
};
1 change: 1 addition & 0 deletions packages/react-router-dev/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"./config/default-rsc-entries/entry.client": "./dist/config/default-rsc-entries/entry.client.tsx",
"./config/default-rsc-entries/entry.rsc": "./dist/config/default-rsc-entries/entry.rsc.tsx",
"./config/default-rsc-entries/entry.ssr": "./dist/config/default-rsc-entries/entry.ssr.tsx",
"./config/default-fetch-handler": "./dist/config/default-fetch-handler.ts",
"./config": {
"types": "./dist/config.d.ts",
"default": "./dist/config.js"
Expand Down
5 changes: 5 additions & 0 deletions packages/react-router-dev/tsup.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ export default defineConfig([
`dist/config/default-rsc-entries/${file}`,
);
}

await fsp.copyFile(
"config/default-fetch-handler.ts",
"dist/config/default-fetch-handler.ts",
);
},
},
],
Expand Down
Loading
Loading