Merge branch 'dev' into fix/middleware-skip-revalidation

Author: brophdawg11

packages/react-router-dev/cli/commands.ts

@@ -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,
@@ -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",

packages/react-router-dev/config/config.ts

@@ -83,6 +83,8 @@ type ServerBundlesBuildManifest = BaseBuildManifest & {
 
 type ServerModuleFormat = "esm" | "cjs";
 
+type ValidateConfigFunction = (config: ReactRouterConfig) => string | void;
+
 interface FutureConfig {
   /**
    * Enable route middleware
@@ -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 = {};
 
@@ -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}`);
     }
@@ -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());
 
@@ -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;
 

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

@@ -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;
@@ -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",
-  );
-}

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

@@ -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",
+  );
+}

packages/react-router-dev/vite/optimize-deps-entries.ts

@@ -0,0 +1,30 @@
+import { escapePath as escapePathAsGlob } from "tinyglobby";
+import type { ResolvedReactRouterConfig } from "../config/config";
+import { resolveRelativeRouteFilePath } from "./resolve-relative-route-file-path";
+import { getVite } from "./vite";
+
+export function getOptimizeDepsEntries({
+  entryClientFilePath,
+  reactRouterConfig,
+}: {
+  entryClientFilePath: string;
+  reactRouterConfig: ResolvedReactRouterConfig;
+}) {
+  if (!reactRouterConfig.future.unstable_optimizeDeps) {
+    return [];
+  }
+
+  const vite = getVite();
+  const viteMajorVersion = parseInt(vite.version.split(".")[0], 10);
+
+  return [
+    vite.normalizePath(entryClientFilePath),
+    ...Object.values(reactRouterConfig.routes).map((route) =>
+      resolveRelativeRouteFilePath(route, reactRouterConfig),
+    ),
+  ].map((entry) =>
+    // In Vite 7, the `optimizeDeps.entries` option only accepts glob patterns.
+    // In prior versions, absolute file paths were treated differently.
+    viteMajorVersion >= 7 ? escapePathAsGlob(entry) : entry,
+  );
+}

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

@@ -55,6 +55,7 @@ import {
 } from "./styles";
 import * as VirtualModule from "./virtual-module";
 import { resolveFileUrl } from "./resolve-file-url";
+import { resolveRelativeRouteFilePath } from "./resolve-relative-route-file-path";
 import { combineURLs } from "./combine-urls";
 import { removeExports } from "./remove-exports";
 import { ssrExternals } from "./ssr-externals";
@@ -79,6 +80,7 @@ import {
   resolveEntryFiles,
   configRouteToBranchRoute,
 } from "../config/config";
+import { getOptimizeDepsEntries } from "./optimize-deps-entries";
 import { decorateComponentExportsWithProps } from "./with-props";
 import validatePluginOrder from "./plugins/validate-plugin-order";
 
@@ -263,17 +265,6 @@ const normalizeRelativeFilePath = (
   return vite.normalizePath(relativePath).split("?")[0];
 };
 
-const resolveRelativeRouteFilePath = (
-  route: RouteManifestEntry,
-  reactRouterConfig: ResolvedReactRouterConfig,
-) => {
-  let vite = getVite();
-  let file = route.file;
-  let fullPath = path.resolve(reactRouterConfig.appDirectory, file);
-
-  return vite.normalizePath(fullPath);
-};
-
 let virtual = {
   serverBuild: VirtualModule.create("server-build"),
   serverManifest: VirtualModule.create("server-manifest"),
@@ -1177,7 +1168,6 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => {
 
         // Ensure sync import of Vite works after async preload
         let vite = getVite();
-        let viteMajorVersion = parseInt(vite.version.split(".")[0], 10);
 
         viteUserConfig = _viteUserConfig;
         viteConfigEnv = _viteConfigEnv;
@@ -1259,18 +1249,10 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => {
             resolve: serverEnvironment.resolve,
           },
           optimizeDeps: {
-            entries: ctx.reactRouterConfig.future.unstable_optimizeDeps
-              ? [
-                  vite.normalizePath(ctx.entryClientFilePath),
-                  ...Object.values(ctx.reactRouterConfig.routes).map((route) =>
-                    resolveRelativeRouteFilePath(route, ctx.reactRouterConfig),
-                  ),
-                ].map((entry) =>
-                  // In Vite 7, the `optimizeDeps.entries` option only accepts glob patterns.
-                  // In prior versions, absolute file paths were treated differently.
-                  viteMajorVersion >= 7 ? escapePathAsGlob(entry) : entry,
-                )
-              : [],
+            entries: getOptimizeDepsEntries({
+              entryClientFilePath: ctx.entryClientFilePath,
+              reactRouterConfig: ctx.reactRouterConfig,
+            }),
             include: [
               // Pre-bundle React dependencies to avoid React duplicates,
               // even if React dependencies are not direct dependencies.

packages/react-router-dev/vite/resolve-relative-route-file-path.ts

@@ -0,0 +1,14 @@
+import path from "pathe";
+import type { ResolvedReactRouterConfig } from "../config/config";
+import type { RouteManifestEntry } from "../config/routes";
+import { getVite } from "./vite";
+
+export function resolveRelativeRouteFilePath(
+  route: RouteManifestEntry,
+  reactRouterConfig: ResolvedReactRouterConfig,
+) {
+  let vite = getVite();
+  let file = route.file;
+  let fullPath = path.resolve(reactRouterConfig.appDirectory, file);
+  return vite.normalizePath(fullPath);
+}