From 9e017237296f0e81e0244425aa790824d6d633b6 Mon Sep 17 00:00:00 2001
From: Romuald Brillout <git@brillout.com>
Date: Thu, 18 Sep 2025 11:55:28 +0200
Subject: [PATCH 1/2] fix: support Vite plugins adding a server entry

---
 packages/react-router-dev/vite/plugin.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/react-router-dev/vite/plugin.ts b/packages/react-router-dev/vite/plugin.ts
index 4f86b5b3f3..1212196fab 100644
--- a/packages/react-router-dev/vite/plugin.ts
+++ b/packages/react-router-dev/vite/plugin.ts
@@ -3540,7 +3540,12 @@ export async function getEnvironmentOptionsResolvers(
               : viteUserConfig.build?.rollupOptions?.input) ??
             virtual.serverBuild.id,
           output: {
-            entryFileNames: serverBuildFile,
+            entryFileNames({ name }) {
+              return name === "virtual_react-router/server-build"
+                ? serverBuildFile
+                : // Rollup's default
+                  "[name].js";
+            },
             format: serverModuleFormat,
           },
         },

From f3c0d274b01813145745ae645da810d95dbdc8d4 Mon Sep 17 00:00:00 2001
From: Romuald Brillout <git@brillout.com>
Date: Thu, 18 Sep 2025 12:03:53 +0200
Subject: [PATCH 2/2] sign CLA

---
 contributors.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contributors.yml b/contributors.yml
index 94272bc656..a4965f5a28 100644
--- a/contributors.yml
+++ b/contributors.yml
@@ -60,6 +60,7 @@
 - briankb
 - BrianT1414
 - Bricklou
+- brillout
 - brockross
 - brookslybrand
 - brophdawg11