From 854cbcd53bdbd9d60579b68b9f88447ea4c51134 Mon Sep 17 00:00:00 2001 From: Mark Dalgleish Date: Mon, 24 Feb 2025 10:31:25 +1100 Subject: [PATCH 1/2] Fix custom client `build.rollupOptions.output` --- .changeset/afraid-tigers-promise.md | 5 +++++ packages/react-router-dev/vite/plugin.ts | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 .changeset/afraid-tigers-promise.md diff --git a/.changeset/afraid-tigers-promise.md b/.changeset/afraid-tigers-promise.md new file mode 100644 index 0000000000..679055de09 --- /dev/null +++ b/.changeset/afraid-tigers-promise.md @@ -0,0 +1,5 @@ +--- +"@react-router/dev": patch +--- + +Fix support for custom client `build.rollupOptions.output` diff --git a/packages/react-router-dev/vite/plugin.ts b/packages/react-router-dev/vite/plugin.ts index 53fd275f3b..a38e27726c 100644 --- a/packages/react-router-dev/vite/plugin.ts +++ b/packages/react-router-dev/vite/plugin.ts @@ -3308,8 +3308,11 @@ export async function getEnvironmentOptionsResolvers( } ), ], - output: { - entryFileNames({ moduleIds }) { + output: (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi + ? viteUserConfig?.environments?.client?.build?.rollupOptions + ?.output + : viteUserConfig?.build?.rollupOptions?.output) ?? { + entryFileNames: ({ moduleIds }) => { let routeChunkModuleId = moduleIds.find(isRouteChunkModuleId); let routeChunkName = routeChunkModuleId ? getRouteChunkNameFromModuleId(routeChunkModuleId) @@ -3318,7 +3321,9 @@ export async function getEnvironmentOptionsResolvers( ? `-${kebabCase(routeChunkName)}` : ""; return path.posix.join( - viteUserConfig.build?.assetsDir ?? "assets", + (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi + ? viteUserConfig?.environments?.client?.build?.assetsDir + : viteUserConfig?.build?.assetsDir) ?? "assets", `[name]${routeChunkSuffix}-[hash].js` ); }, From 56a8818ce185e7483abd83eb4c46c01af6b4144f Mon Sep 17 00:00:00 2001 From: Mark Dalgleish Date: Mon, 24 Feb 2025 10:34:53 +1100 Subject: [PATCH 2/2] Update changeset --- .changeset/afraid-tigers-promise.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/afraid-tigers-promise.md b/.changeset/afraid-tigers-promise.md index 679055de09..3913d50550 100644 --- a/.changeset/afraid-tigers-promise.md +++ b/.changeset/afraid-tigers-promise.md @@ -2,4 +2,4 @@ "@react-router/dev": patch --- -Fix support for custom client `build.rollupOptions.output` +Fix support for custom client `build.rollupOptions.output.entryFileNames`