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
20 changes: 13 additions & 7 deletions src/dev.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import bunAdapter from "@hono/vite-dev-server/bun";
import nodeAdapter from "@hono/vite-dev-server/node";
import type { Config as ReactRouterConfig } from "@react-router/dev/config";
import type { Plugin, UserConfig } from "vite";
import { getReactVersion } from "./helpers";
import type { Runtime } from "./types/runtime";

type MetaEnv<T> = {
Expand Down Expand Up @@ -77,7 +78,7 @@ export function reactRouterHonoServer(options: ReactRouterHonoServerPluginOption
`;
}
},
config(config) {
async config(config) {
pluginConfig = resolvePluginConfig(config, options);

if (!pluginConfig) {
Expand Down Expand Up @@ -120,15 +121,20 @@ export function reactRouterHonoServer(options: ReactRouterHonoServerPluginOption
reactRouterBuildFile = "assets/server-build.js";
}

let alias = undefined;

if (runtime === "cloudflare") {
const reactVersion = await getReactVersion();

alias = {
"react-dom/server": reactVersion >= 19 ? "react-dom/server.edge" : "react-dom/server.browser",
};
}

return {
...baseConfig,
resolve: {
alias:
runtime === "cloudflare"
? {
"react-dom/server": "react-dom/server.browser",
}
: undefined,
alias,
},
build: {
// https://vite.dev/config/build-options#build-target
Expand Down
8 changes: 8 additions & 0 deletions src/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -166,3 +166,11 @@ export async function importBuild(): Promise<ServerBuild> {
export function createGetLoadContext(getLoadContext: HonoServerOptionsBase<Env>["getLoadContext"]) {
return getLoadContext;
}

/**
* Retrieves the major React version from node_modules
*/
export async function getReactVersion() {
const reactVersion = await import("react");
return Number.parseInt(reactVersion?.version.split(".")[0]);
}