Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .changeset/fix-preset-future-flags.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
"@react-router/dev": patch
---

Fix preset future flags being ignored during config resolution

Fixes a bug where future flags defined by presets were completely ignored. The config resolution was incorrectly reading from `reactRouterUserConfig.future` instead of the merged `userAndPresetConfigs.future`, causing all preset-defined future flags to be lost.

This fix ensures presets can properly enable experimental features as intended by the preset system design.
21 changes: 21 additions & 0 deletions integration/vite-presets-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,17 @@ const files = {
}),
},

// Ensure presets can set future flags
{
name: "test-preset",
reactRouterConfig: async () => ({
future: {
v8_middleware: true,
unstable_optimizeDeps: true,
},
}),
},

// Ensure presets can set buildEnd option (this is critical for Vercel support)
{
name: "test-preset",
Expand All @@ -128,6 +139,7 @@ const files = {
"export const buildManifest = " + serializeJs(buildManifest, { space: 2, unsafe: true }) + ";",
"export const reactRouterConfig = " + serializeJs(reactRouterConfig, { space: 2, unsafe: true }) + ";",
"export const assetsDir = " + JSON.stringify(viteConfig.build.assetsDir) + ";",
"export const futureFlags = " + JSON.stringify(reactRouterConfig.future) + ";",
].join("\\n"),
"utf-8"
);
Expand Down Expand Up @@ -229,6 +241,15 @@ test.describe("Vite / presets", async () => {
"unstable_routeConfig",
]);

// Ensure future flags from presets are properly merged
expect(buildEndArgsMeta.futureFlags).toEqual({
v8_middleware: true,
unstable_optimizeDeps: true,
unstable_splitRouteModules: false,
unstable_subResourceIntegrity: false,
unstable_viteEnvironmentApi: false,
});

// Ensure we get a valid build manifest
expect(buildEndArgsMeta.buildManifest).toEqual({
routeIdToServerBundleId: {
Expand Down
10 changes: 5 additions & 5 deletions packages/react-router-dev/config/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -587,15 +587,15 @@ async function resolveConfig({
}

let future: FutureConfig = {
v8_middleware: reactRouterUserConfig.future?.v8_middleware ?? false,
v8_middleware: userAndPresetConfigs.future?.v8_middleware ?? false,
unstable_optimizeDeps:
reactRouterUserConfig.future?.unstable_optimizeDeps ?? false,
userAndPresetConfigs.future?.unstable_optimizeDeps ?? false,
unstable_splitRouteModules:
reactRouterUserConfig.future?.unstable_splitRouteModules ?? false,
userAndPresetConfigs.future?.unstable_splitRouteModules ?? false,
unstable_subResourceIntegrity:
reactRouterUserConfig.future?.unstable_subResourceIntegrity ?? false,
userAndPresetConfigs.future?.unstable_subResourceIntegrity ?? false,
unstable_viteEnvironmentApi:
reactRouterUserConfig.future?.unstable_viteEnvironmentApi ?? false,
userAndPresetConfigs.future?.unstable_viteEnvironmentApi ?? false,
};

let reactRouterConfig: ResolvedReactRouterConfig = deepFreeze({
Expand Down
Loading