@react-router/dev 0.0.0-experimental-795b50c5b → 0.0.0-experimental-ae6d61df4

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-795b50c5b
+ * @react-router/dev v0.0.0-experimental-ae6d61df4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-795b50c5b
+ * @react-router/dev v0.0.0-experimental-ae6d61df4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -407,7 +407,8 @@ async function resolveConfig({
   root,
   viteNodeContext,
   reactRouterConfigFile,
-  skipRoutes
+  skipRoutes,
+  validateConfig
 }) {
   let reactRouterUserConfig = {};
   if (reactRouterConfigFile) {
@@ -425,6 +426,12 @@ async function resolveConfig({
         return err(`${reactRouterConfigFile} must export a config`);
       }
       reactRouterUserConfig = configModule.default;
+      if (validateConfig) {
+        const error = validateConfig(reactRouterUserConfig);
+        if (error) {
+          return err(error);
+        }
+      }
     } catch (error) {
       return err(`Error loading ${reactRouterConfigFile}: ${error}`);
     }
@@ -513,7 +520,7 @@ async function resolveConfig({
   }
   let appDirectory = import_pathe3.default.resolve(root, userAppDirectory || "app");
   let buildDirectory = import_pathe3.default.resolve(root, userBuildDirectory);
-  let rootRouteFile = findEntry(appDirectory, "root");
+  let rootRouteFile = findEntry(appDirectory, "root", { absolute: true });
   if (!rootRouteFile) {
     let rootRouteDisplayPath = import_pathe3.default.relative(
       root,
@@ -554,7 +561,7 @@ async function resolveConfig({
         {
           id: "root",
           path: "",
-          file: rootRouteFile,
+          file: import_pathe3.default.relative(appDirectory, rootRouteFile),
           children: result.routeConfig
         }
       ];
@@ -592,6 +599,7 @@ async function resolveConfig({
     serverBundles,
     serverModuleFormat,
     ssr,
+    unstable_rootRouteFile: rootRouteFile,
     unstable_routeConfig: routeConfig
   });
   for (let preset of reactRouterUserConfig.presets ?? []) {
@@ -603,7 +611,8 @@ async function createConfigLoader({
   rootDirectory: root,
   watch,
   mode,
-  skipRoutes
+  skipRoutes,
+  validateConfig
 }) {
   root = import_pathe3.default.normalize(root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd());
   let vite2 = await import("vite");
@@ -622,7 +631,13 @@ async function createConfigLoader({
     });
   };
   updateReactRouterConfigFile();
-  let getConfig = () => resolveConfig({ root, viteNodeContext, reactRouterConfigFile, skipRoutes });
+  let getConfig = () => resolveConfig({
+    root,
+    viteNodeContext,
+    reactRouterConfigFile,
+    skipRoutes,
+    validateConfig
+  });
   let appDirectory;
   let initialConfigResult = await getConfig();
   if (!initialConfigResult.ok) {