Skip to content

Remove resolved unstable_rootRoute config #14319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markdalgleish merged 2 commits into from
Sep 11, 2025
Merged

Remove resolved unstable_rootRoute config #14319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdc7839
Remove resolved `unstable_rootRoute` config
markdalgleish Sep 11, 2025
e5d004d
Resolve root route file path
markdalgleish Sep 11, 2025
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
1 change: 0 additions & 1 deletion integration/vite-presets-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,6 @@ test.describe("Vite / presets", async () => {
"serverBundles",
"serverModuleFormat",
"ssr",
"unstable_rootRouteFile",
"unstable_routeConfig",
]);

Expand Down
5 changes: 0 additions & 5 deletions packages/react-router-dev/config/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,10 +264,6 @@ export type ResolvedReactRouterConfig = Readonly<{
* SPA without server-rendering. Default's to `true`.
*/
ssr: boolean;
/**
* The absolute path to the root route file.
*/
unstable_rootRouteFile: string;
/**
* The resolved array of route config entries exported from `routes.ts`
*/
Expand Down Expand Up @@ -615,7 +611,6 @@ async function resolveConfig({
serverBundles,
serverModuleFormat,
ssr,
unstable_rootRouteFile: rootRouteFile,
unstable_routeConfig: routeConfig,
} satisfies ResolvedReactRouterConfig);

Expand Down
18 changes: 14 additions & 4 deletions packages/react-router-dev/vite/rsc/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type * as Vite from "vite";
import { init as initEsModuleLexer } from "es-module-lexer";
import * as Path from "pathe";
import * as babel from "@babel/core";
import colors from "picocolors";

Expand Down Expand Up @@ -28,14 +29,23 @@ import { warnOnClientSourceMaps } from "../plugins/warn-on-client-source-maps";

export function reactRouterRSCVitePlugin(): Vite.PluginOption[] {
let configLoader: ConfigLoader;
let config: ResolvedReactRouterConfig;
let typegenWatcherPromise: Promise<Typegen.Watcher> | undefined;
let viteCommand: Vite.ConfigEnv["command"];
let routeIdByFile: Map<string, string> | undefined;
let logger: Vite.Logger;

const defaultEntries = getDefaultEntries();

let config: ResolvedReactRouterConfig;
let rootRouteFile: string;
function updateConfig(newConfig: ResolvedReactRouterConfig) {
config = newConfig;
rootRouteFile = Path.resolve(
newConfig.appDirectory,
newConfig.routes.root.file,
);
}

return [
{
name: "react-router/rsc",
Expand Down Expand Up @@ -75,7 +85,7 @@ export function reactRouterRSCVitePlugin(): Vite.PluginOption[] {

const configResult = await configLoader.getConfig();
if (!configResult.ok) throw new Error(configResult.error);
config = configResult.value;
updateConfig(configResult.value);

if (
viteUserConfig.base &&
Expand Down Expand Up @@ -246,7 +256,7 @@ export function reactRouterRSCVitePlugin(): Vite.PluginOption[] {
});

// Update shared plugin config reference
config = result.value;
updateConfig(result.value);

if (configChanged || routeConfigChanged) {
invalidateVirtualModules(viteDevServer);
Expand Down Expand Up @@ -315,7 +325,7 @@ export function reactRouterRSCVitePlugin(): Vite.PluginOption[] {
id,
viteCommand,
routeIdByFile,
rootRouteFile: config.unstable_rootRouteFile,
rootRouteFile,
viteEnvironment: this.environment,
});
},
Expand Down
Loading