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/cli/commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { transpile as convertFileToJS } from "./useJavascript";
import * as profiler from "../vite/profiler";
import * as Typegen from "../typegen";
import { preloadVite, getVite } from "../vite/vite";
import { hasReactRouterRscPlugin } from "../vite/has-rsc-plugin";

export async function routes(
rootDirectory?: string,
Expand Down Expand Up @@ -89,14 +90,32 @@ export async function generateEntry(
mode?: string;
} = {},
) {
rootDirectory = resolveRootDirectory(rootDirectory, flags);

if (
await hasReactRouterRscPlugin({
root: rootDirectory,
viteBuildOptions: {
config: flags.config,
mode: flags.mode,
},
})
) {
console.error(
colors.red(
`The reveal command is currently not supported in RSC Framework Mode.`,
),
);
process.exit(1);
}

// if no entry passed, attempt to create both
if (!entry) {
await generateEntry("entry.client", rootDirectory, flags);
await generateEntry("entry.server", rootDirectory, flags);
return;
}

rootDirectory = resolveRootDirectory(rootDirectory, flags);
let configResult = await loadConfig({
rootDirectory,
mode: flags.mode ?? "production",
Expand Down
25 changes: 1 addition & 24 deletions packages/react-router-dev/vite/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
} from "./plugin";
import invariant from "../invariant";
import { preloadVite, getVite } from "./vite";
import { hasReactRouterRscPlugin } from "./has-rsc-plugin";
export interface ViteBuildOptions {
assetsInlineLimit?: number;
clearScreen?: boolean;
Expand Down Expand Up @@ -234,27 +235,3 @@ async function viteBuild(
viteConfig,
});
}

async function hasReactRouterRscPlugin({
root,
viteBuildOptions: { config, logLevel, mode },
}: {
root: string;
viteBuildOptions: ViteBuildOptions;
}): Promise<boolean> {
const vite = await import("vite");
const viteConfig = await vite.resolveConfig(
{
configFile: config,
logLevel,
mode: mode ?? "production",
root,
},
"build", // command
"production", // default mode
"production", // default NODE_ENV
);
return viteConfig.plugins.some(
(plugin) => plugin?.name === "react-router/rsc",
);
}
29 changes: 29 additions & 0 deletions packages/react-router-dev/vite/has-rsc-plugin.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import type * as Vite from "vite";

export async function hasReactRouterRscPlugin({
root,
viteBuildOptions: { config, logLevel, mode },
}: {
root: string;
viteBuildOptions: {
config?: string;
logLevel?: Vite.LogLevel;
mode?: string;
};
}): Promise<boolean> {
const vite = await import("vite");
const viteConfig = await vite.resolveConfig(
{
configFile: config,
logLevel,
mode: mode ?? "production",
root,
},
"build", // command
"production", // default mode
"production", // default NODE_ENV
);
return viteConfig.plugins.some(
(plugin) => plugin?.name === "react-router/rsc",
);
}
Loading