From 087df756f16820f4201c1e7ed9684c9ad2d21346 Mon Sep 17 00:00:00 2001
From: hlimas <hlimas@ebay.com>
Date: Tue, 12 Aug 2025 16:22:11 -0700
Subject: [PATCH 1/3] Support for buildDirectory on RSC framework output

---
 .changeset/neat-beers-punch.md               |  5 +++++
 packages/react-router-dev/vite/rsc/plugin.ts | 18 +++++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/neat-beers-punch.md

diff --git a/.changeset/neat-beers-punch.md b/.changeset/neat-beers-punch.md
new file mode 100644
index 0000000000..726a2e7dc6
--- /dev/null
+++ b/.changeset/neat-beers-punch.md
@@ -0,0 +1,5 @@
+---
+"@react-router/dev": patch
+---
+
+Support for buildDirectory on RSC framework output
diff --git a/packages/react-router-dev/vite/rsc/plugin.ts b/packages/react-router-dev/vite/rsc/plugin.ts
index f2854d12e5..106a1fdc0c 100644
--- a/packages/react-router-dev/vite/rsc/plugin.ts
+++ b/packages/react-router-dev/vite/rsc/plugin.ts
@@ -75,9 +75,21 @@ export function reactRouterRSCVitePlugin(): Vite.PluginOption[] {
             jsxDev: viteCommand !== "build",
           },
           environments: {
-            client: { build: { outDir: "build/client" } },
-            rsc: { build: { outDir: "build/server" } },
-            ssr: { build: { outDir: "build/server/__ssr_build" } },
+            client: {
+              build: {
+                outDir: join(config.buildDirectory, "client"),
+              },
+            },
+            rsc: {
+              build: {
+                outDir: join(config.buildDirectory, "server"),
+              },
+            },
+            ssr: {
+              build: {
+                outDir: join(config.buildDirectory, "server/__ssr_build"),
+              },
+            },
           },
           build: {
             rollupOptions: {

From 20a73cce91d1709b55bd6f4d524229a9fcb1e687 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= <info@michaeldeboey.be>
Date: Wed, 13 Aug 2025 22:18:47 +0200
Subject: [PATCH 2/3] Update .changeset/neat-beers-punch.md

---
 .changeset/neat-beers-punch.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/neat-beers-punch.md b/.changeset/neat-beers-punch.md
index 726a2e7dc6..21bea80d52 100644
--- a/.changeset/neat-beers-punch.md
+++ b/.changeset/neat-beers-punch.md
@@ -2,4 +2,4 @@
 "@react-router/dev": patch
 ---
 
-Support for buildDirectory on RSC framework output
+Add support for `buildDirectory` on RSC framework output

From 829a202a7cc71f6fc10ceb4dbf773fc4ebd9129a Mon Sep 17 00:00:00 2001
From: Mark Dalgleish <mark.john.dalgleish@gmail.com>
Date: Fri, 15 Aug 2025 09:43:18 +1000
Subject: [PATCH 3/3] Remove changeset

---
 .changeset/neat-beers-punch.md | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 .changeset/neat-beers-punch.md

diff --git a/.changeset/neat-beers-punch.md b/.changeset/neat-beers-punch.md
deleted file mode 100644
index 21bea80d52..0000000000
--- a/.changeset/neat-beers-punch.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@react-router/dev": patch
----
-
-Add support for `buildDirectory` on RSC framework output