Skip to content

Commit 6f6f1c6

Browse files
Fix assetsDir in entryFileNames with Vite Env API (#13491)
1 parent efdf26c commit 6f6f1c6

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

.changeset/rude-cobras-warn.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@react-router/dev": patch
3+
---
4+
5+
When `future.unstable_viteEnvironmentApi` is enabled, ensure that `build.assetsDir` in Vite config is respected when `environments.client.build.assetsDir` is not configured

packages/react-router-dev/vite/plugin.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3545,10 +3545,14 @@ export async function getEnvironmentOptionsResolvers(
35453545
let routeChunkSuffix = routeChunkName
35463546
? `-${kebabCase(routeChunkName)}`
35473547
: "";
3548-
return path.posix.join(
3548+
let assetsDir =
35493549
(ctx.reactRouterConfig.future.unstable_viteEnvironmentApi
35503550
? viteUserConfig?.environments?.client?.build?.assetsDir
3551-
: viteUserConfig?.build?.assetsDir) ?? "assets",
3551+
: null) ??
3552+
viteUserConfig?.build?.assetsDir ??
3553+
"assets";
3554+
return path.posix.join(
3555+
assetsDir,
35523556
`[name]${routeChunkSuffix}-[hash].js`
35533557
);
35543558
},

0 commit comments

Comments
 (0)