From a49a6397941c4c89d70897d77f75022b283424a2 Mon Sep 17 00:00:00 2001
From: Mark Dalgleish <mark.john.dalgleish@gmail.com>
Date: Fri, 21 Feb 2025 10:50:05 +1100
Subject: [PATCH] Fix support for custom `build.assetsDir`

---
 .changeset/gold-insects-remain.md        | 5 +++++
 packages/react-router-dev/vite/plugin.ts | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/gold-insects-remain.md

diff --git a/.changeset/gold-insects-remain.md b/.changeset/gold-insects-remain.md
new file mode 100644
index 0000000000..0977a09f51
--- /dev/null
+++ b/.changeset/gold-insects-remain.md
@@ -0,0 +1,5 @@
+---
+"@react-router/dev": patch
+---
+
+Fix support for custom `build.assetsDir`
diff --git a/packages/react-router-dev/vite/plugin.ts b/packages/react-router-dev/vite/plugin.ts
index 8d04232580..2ce9f1584e 100644
--- a/packages/react-router-dev/vite/plugin.ts
+++ b/packages/react-router-dev/vite/plugin.ts
@@ -3248,7 +3248,10 @@ export async function getEnvironmentOptionsResolvers(
                 let routeChunkSuffix = routeChunkName
                   ? `-${kebabCase(routeChunkName)}`
                   : "";
-                return `assets/[name]${routeChunkSuffix}-[hash].js`;
+                return path.posix.join(
+                  viteUserConfig.build?.assetsDir ?? "assets",
+                  `[name]${routeChunkSuffix}-[hash].js`
+                );
               },
             },
           },