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
21 changes: 20 additions & 1 deletion packages/react-router-dev/config/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ type ServerBundlesBuildManifest = BaseBuildManifest & {

type ServerModuleFormat = "esm" | "cjs";

type ValidateConfigFunction = (config: ReactRouterConfig) => string | void;

interface FutureConfig {
/**
* Enable route middleware
Expand Down Expand Up @@ -356,11 +358,13 @@ async function resolveConfig({
viteNodeContext,
reactRouterConfigFile,
skipRoutes,
validateConfig,
}: {
root: string;
viteNodeContext: ViteNode.Context;
reactRouterConfigFile?: string;
skipRoutes?: boolean;
validateConfig?: ValidateConfigFunction;
}): Promise<Result<ResolvedReactRouterConfig>> {
let reactRouterUserConfig: ReactRouterConfig = {};

Expand All @@ -383,6 +387,13 @@ async function resolveConfig({
}

reactRouterUserConfig = configModule.default;

if (validateConfig) {
const error = validateConfig(reactRouterUserConfig);
if (error) {
return err(error);
}
}
} catch (error) {
return err(`Error loading ${reactRouterConfigFile}: ${error}`);
}
Expand Down Expand Up @@ -631,11 +642,13 @@ export async function createConfigLoader({
watch,
mode,
skipRoutes,
validateConfig,
}: {
watch: boolean;
rootDirectory?: string;
mode: string;
skipRoutes?: boolean;
validateConfig?: ValidateConfigFunction;
}): Promise<ConfigLoader> {
root = Path.normalize(root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd());

Expand All @@ -660,7 +673,13 @@ export async function createConfigLoader({
updateReactRouterConfigFile();

let getConfig = () =>
resolveConfig({ root, viteNodeContext, reactRouterConfigFile, skipRoutes });
resolveConfig({
root,
viteNodeContext,
reactRouterConfigFile,
skipRoutes,
validateConfig,
});

let appDirectory: string;

Expand Down
26 changes: 25 additions & 1 deletion packages/react-router-dev/vite/rsc/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,31 @@ export function reactRouterRSCVitePlugin(): Vite.PluginOption[] {
const rootDirectory = getRootDirectory(viteUserConfig);
const watch = command === "serve";

configLoader = await createConfigLoader({ rootDirectory, mode, watch });
configLoader = await createConfigLoader({
rootDirectory,
mode,
watch,
validateConfig: (userConfig) => {
let errors: string[] = [];
if (userConfig.buildEnd) errors.push("buildEnd");
if (userConfig.prerender) errors.push("prerender");
if (userConfig.presets?.length) errors.push("presets");
if (userConfig.routeDiscovery) errors.push("routeDiscovery");
if (userConfig.serverBundles) errors.push("serverBundles");
if (userConfig.ssr === false) errors.push("ssr: false");
if (userConfig.future?.unstable_splitRouteModules)
errors.push("future.unstable_splitRouteModules");
if (userConfig.future?.unstable_viteEnvironmentApi === false)
errors.push("future.unstable_viteEnvironmentApi: false");
if (userConfig.future?.v8_middleware === false)
errors.push("future.v8_middleware: false");
if (userConfig.future?.unstable_subResourceIntegrity)
errors.push("future.unstable_subResourceIntegrity");
if (errors.length) {
return `RSC Framework Mode does not currently support the following React Router config:\n${errors.map((x) => ` - ${x}`).join("\n")}\n`;
}
},
});

const configResult = await configLoader.getConfig();
if (!configResult.ok) throw new Error(configResult.error);
Expand Down
Loading