From 2fbdefcbb96a32823164016a4b6529b369e251b2 Mon Sep 17 00:00:00 2001 From: Mark Dalgleish Date: Tue, 29 Apr 2025 15:47:26 +1000 Subject: [PATCH] Fix `assetsDir` in `entryFileNames` with Vite Env API --- .changeset/rude-cobras-warn.md | 5 +++++ packages/react-router-dev/vite/plugin.ts | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 .changeset/rude-cobras-warn.md diff --git a/.changeset/rude-cobras-warn.md b/.changeset/rude-cobras-warn.md new file mode 100644 index 0000000000..3362b59ff3 --- /dev/null +++ b/.changeset/rude-cobras-warn.md @@ -0,0 +1,5 @@ +--- +"@react-router/dev": patch +--- + +When `future.unstable_viteEnvironmentApi` is enabled, ensure that `build.assetsDir` in Vite config is respected when `environments.client.build.assetsDir` is not configured diff --git a/packages/react-router-dev/vite/plugin.ts b/packages/react-router-dev/vite/plugin.ts index f9fb670749..427d0f0394 100644 --- a/packages/react-router-dev/vite/plugin.ts +++ b/packages/react-router-dev/vite/plugin.ts @@ -3541,10 +3541,14 @@ export async function getEnvironmentOptionsResolvers( let routeChunkSuffix = routeChunkName ? `-${kebabCase(routeChunkName)}` : ""; - return path.posix.join( + let assetsDir = (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig?.environments?.client?.build?.assetsDir - : viteUserConfig?.build?.assetsDir) ?? "assets", + : null) ?? + viteUserConfig?.build?.assetsDir ?? + "assets"; + return path.posix.join( + assetsDir, `[name]${routeChunkSuffix}-[hash].js` ); },