@react-router/dev 0.0.0-experimental-ab0e85b04 → 0.0.0-experimental-818f8e08d

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-ab0e85b04
+ * @react-router/dev v0.0.0-experimental-818f8e08d
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-ab0e85b04
+ * @react-router/dev v0.0.0-experimental-818f8e08d
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-ab0e85b04
+ * @react-router/dev v0.0.0-experimental-818f8e08d
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -197,15 +197,13 @@ var ssrExternals = isReactRouterRepo() ? [
 // vite/vite-node.ts
 async function createContext({
   root,
-  mode,
-  customLogger
+  mode
 }) {
   await preloadVite();
   const vite2 = getVite();
   const devServer = await vite2.createServer({
     root,
     mode,
-    customLogger,
     server: {
       preTransformRequests: false,
       hmr: false,
@@ -303,7 +301,7 @@ function validateRouteConfig({
         `Route config in "${routeConfigFile}" is invalid.`,
         root ? `${root}` : [],
         nested ? Object.entries(nested).map(
-          ([path3, message]) => `Path: routes.${path3}
+          ([path4, message]) => `Path: routes.${path4}
 ${message}`
         ) : []
       ].flat().join("\n\n")
@@ -396,8 +394,7 @@ function err(error) {
 async function resolveConfig({
   root,
   viteNodeContext,
-  reactRouterConfigFile,
-  skipRoutes
+  reactRouterConfigFile
 }) {
   let reactRouterUserConfig = {};
   if (reactRouterConfigFile) {
@@ -513,50 +510,45 @@ async function resolveConfig({
       `Could not find a root route module in the app directory as "${rootRouteDisplayPath}"`
     );
   }
-  let routes = {};
-  if (!skipRoutes) {
-    routes = {
-      root: { path: "", id: "root", file: rootRouteFile }
-    };
-    let routeConfigFile = findEntry(appDirectory, "routes");
-    try {
-      if (!routeConfigFile) {
-        let routeConfigDisplayPath = import_pathe3.default.relative(
-          root,
-          import_pathe3.default.join(appDirectory, "routes.ts")
-        );
-        return err(
-          `Route config file not found at "${routeConfigDisplayPath}".`
-        );
-      }
-      setAppDirectory(appDirectory);
-      let routeConfigExport = (await viteNodeContext.runner.executeFile(
-        import_pathe3.default.join(appDirectory, routeConfigFile)
-      )).default;
-      let routeConfig = await routeConfigExport;
-      let result = validateRouteConfig({
-        routeConfigFile,
-        routeConfig
-      });
-      if (!result.valid) {
-        return err(result.message);
-      }
-      routes = {
-        ...routes,
-        ...configRoutesToRouteManifest(appDirectory, routeConfig)
-      };
-    } catch (error) {
-      return err(
-        [
-          import_picocolors.default.red(`Route config in "${routeConfigFile}" is invalid.`),
-          "",
-          error.loc?.file && error.loc?.column && error.frame ? [
-            import_pathe3.default.relative(appDirectory, error.loc.file) + ":" + error.loc.line + ":" + error.loc.column,
-            error.frame.trim?.()
-          ] : error.stack
-        ].flat().join("\n")
+  let routes = {
+    root: { path: "", id: "root", file: rootRouteFile }
+  };
+  let routeConfigFile = findEntry(appDirectory, "routes");
+  try {
+    if (!routeConfigFile) {
+      let routeConfigDisplayPath = import_pathe3.default.relative(
+        root,
+        import_pathe3.default.join(appDirectory, "routes.ts")
       );
+      return err(`Route config file not found at "${routeConfigDisplayPath}".`);
+    }
+    setAppDirectory(appDirectory);
+    let routeConfigExport = (await viteNodeContext.runner.executeFile(
+      import_pathe3.default.join(appDirectory, routeConfigFile)
+    )).default;
+    let routeConfig = await routeConfigExport;
+    let result = validateRouteConfig({
+      routeConfigFile,
+      routeConfig
+    });
+    if (!result.valid) {
+      return err(result.message);
     }
+    routes = {
+      ...routes,
+      ...configRoutesToRouteManifest(appDirectory, routeConfig)
+    };
+  } catch (error) {
+    return err(
+      [
+        import_picocolors.default.red(`Route config in "${routeConfigFile}" is invalid.`),
+        "",
+        error.loc?.file && error.loc?.column && error.frame ? [
+          import_pathe3.default.relative(appDirectory, error.loc.file) + ":" + error.loc.line + ":" + error.loc.column,
+          error.frame.trim?.()
+        ] : error.stack
+      ].flat().join("\n")
+    );
   }
   let future = {
     unstable_middleware: reactRouterUserConfig.future?.unstable_middleware ?? false,
@@ -587,34 +579,24 @@ async function resolveConfig({
 async function createConfigLoader({
   rootDirectory: root,
   watch,
-  mode,
-  skipRoutes
+  mode
 }) {
-  root = import_pathe3.default.normalize(root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd());
-  let vite2 = await import("vite");
+  root = root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd();
   let viteNodeContext = await createContext({
     root,
-    mode,
-    // Filter out any info level logs from vite-node
-    customLogger: vite2.createLogger("warn", {
-      prefix: "[react-router]"
-    })
+    mode
   });
-  let reactRouterConfigFile;
-  let updateReactRouterConfigFile = () => {
-    reactRouterConfigFile = findEntry(root, "react-router.config", {
-      absolute: true
-    });
-  };
-  updateReactRouterConfigFile();
-  let getConfig = () => resolveConfig({ root, viteNodeContext, reactRouterConfigFile, skipRoutes });
+  let reactRouterConfigFile = findEntry(root, "react-router.config", {
+    absolute: true
+  });
+  let getConfig = () => resolveConfig({ root, viteNodeContext, reactRouterConfigFile });
   let appDirectory;
   let initialConfigResult = await getConfig();
   if (!initialConfigResult.ok) {
     throw new Error(initialConfigResult.error);
   }
-  appDirectory = import_pathe3.default.normalize(initialConfigResult.value.appDirectory);
-  let currentConfig = initialConfigResult.value;
+  appDirectory = initialConfigResult.value.appDirectory;
+  let lastConfig = initialConfigResult.value;
   let fsWatcher;
   let changeHandlers = [];
   return {
@@ -627,71 +609,41 @@ async function createConfigLoader({
       }
       changeHandlers.push(handler);
       if (!fsWatcher) {
-        fsWatcher = import_chokidar.default.watch([root, appDirectory], {
-          ignoreInitial: true,
-          ignored: (path3) => {
-            let dirname = import_pathe3.default.dirname(path3);
-            return !dirname.startsWith(appDirectory) && // Ensure we're only watching files outside of the app directory
-            // that are at the root level, not nested in subdirectories
-            path3 !== root && // Watch the root directory itself
-            dirname !== root;
-          }
-        });
+        fsWatcher = import_chokidar.default.watch(
+          [
+            ...reactRouterConfigFile ? [reactRouterConfigFile] : [],
+            appDirectory
+          ],
+          { ignoreInitial: true }
+        );
         fsWatcher.on("all", async (...args) => {
           let [event, rawFilepath] = args;
           let filepath = import_pathe3.default.normalize(rawFilepath);
-          let fileAddedOrRemoved = event === "add" || event === "unlink";
-          let appFileAddedOrRemoved = fileAddedOrRemoved && filepath.startsWith(import_pathe3.default.normalize(appDirectory));
-          let rootRelativeFilepath = import_pathe3.default.relative(root, filepath);
-          let configFileAddedOrRemoved = fileAddedOrRemoved && isEntryFile("react-router.config", rootRelativeFilepath);
-          if (configFileAddedOrRemoved) {
-            updateReactRouterConfigFile();
-          }
-          let moduleGraphChanged = configFileAddedOrRemoved || Boolean(
+          let appFileAddedOrRemoved = appDirectory && (event === "add" || event === "unlink") && filepath.startsWith(import_pathe3.default.normalize(appDirectory));
+          let configCodeUpdated = Boolean(
             viteNodeContext.devServer?.moduleGraph.getModuleById(filepath)
           );
-          if (!moduleGraphChanged && !appFileAddedOrRemoved) {
-            return;
-          }
-          viteNodeContext.devServer?.moduleGraph.invalidateAll();
-          viteNodeContext.runner?.moduleCache.clear();
-          let result = await getConfig();
-          let prevAppDirectory = appDirectory;
-          appDirectory = import_pathe3.default.normalize(
-            (result.value ?? currentConfig).appDirectory
-          );
-          if (appDirectory !== prevAppDirectory) {
-            fsWatcher.unwatch(prevAppDirectory);
-            fsWatcher.add(appDirectory);
-          }
-          let configCodeChanged = configFileAddedOrRemoved || reactRouterConfigFile !== void 0 && isEntryFileDependency(
-            viteNodeContext.devServer.moduleGraph,
-            reactRouterConfigFile,
-            filepath
-          );
-          let routeConfigFile = !skipRoutes ? findEntry(appDirectory, "routes", {
-            absolute: true
-          }) : void 0;
-          let routeConfigCodeChanged = routeConfigFile !== void 0 && isEntryFileDependency(
-            viteNodeContext.devServer.moduleGraph,
-            routeConfigFile,
-            filepath
-          );
-          let configChanged = result.ok && !(0, import_isEqual.default)(omitRoutes(currentConfig), omitRoutes(result.value));
-          let routeConfigChanged = result.ok && !(0, import_isEqual.default)(currentConfig?.routes, result.value.routes);
-          for (let handler2 of changeHandlers) {
-            handler2({
-              result,
-              configCodeChanged,
-              routeConfigCodeChanged,
-              configChanged,
-              routeConfigChanged,
-              path: filepath,
-              event
-            });
+          if (configCodeUpdated || appFileAddedOrRemoved) {
+            viteNodeContext.devServer?.moduleGraph.invalidateAll();
+            viteNodeContext.runner?.moduleCache.clear();
           }
-          if (result.ok) {
-            currentConfig = result.value;
+          if (appFileAddedOrRemoved || configCodeUpdated) {
+            let result = await getConfig();
+            let configChanged = result.ok && !(0, import_isEqual.default)(lastConfig, result.value);
+            let routeConfigChanged = result.ok && !(0, import_isEqual.default)(lastConfig?.routes, result.value.routes);
+            for (let handler2 of changeHandlers) {
+              handler2({
+                result,
+                configCodeUpdated,
+                configChanged,
+                routeConfigChanged,
+                path: filepath,
+                event
+              });
+            }
+            if (result.ok) {
+              lastConfig = result.value;
+            }
           }
         });
       }
@@ -710,29 +662,18 @@ async function createConfigLoader({
 }
 async function loadConfig({
   rootDirectory,
-  mode,
-  skipRoutes
+  mode
 }) {
   let configLoader = await createConfigLoader({
     rootDirectory,
     mode,
-    skipRoutes,
     watch: false
   });
   let config = await configLoader.getConfig();
   await configLoader.close();
   return config;
 }
-function omitRoutes(config) {
-  return {
-    ...config,
-    routes: {}
-  };
-}
 var entryExts = [".js", ".jsx", ".ts", ".tsx"];
-function isEntryFile(entryBasename, filename) {
-  return entryExts.some((ext) => filename === `${entryBasename}${ext}`);
-}
 function findEntry(dir, basename, options) {
   let currentDir = import_pathe3.default.resolve(dir);
   let { root } = import_pathe3.default.parse(currentDir);
@@ -753,30 +694,6 @@ function findEntry(dir, basename, options) {
     currentDir = parentDir;
   }
 }
-function isEntryFileDependency(moduleGraph, entryFilepath, filepath, visited = /* @__PURE__ */ new Set()) {
-  entryFilepath = import_pathe3.default.normalize(entryFilepath);
-  filepath = import_pathe3.default.normalize(filepath);
-  if (visited.has(filepath)) {
-    return false;
-  }
-  visited.add(filepath);
-  if (filepath === entryFilepath) {
-    return true;
-  }
-  let mod = moduleGraph.getModuleById(filepath);
-  if (!mod) {
-    return false;
-  }
-  for (let importer of mod.importers) {
-    if (!importer.id) {
-      continue;
-    }
-    if (importer.id === entryFilepath || isEntryFileDependency(moduleGraph, entryFilepath, importer.id, visited)) {
-      return true;
-    }
-  }
-  return false;
-}
 
 // vite/cloudflare-dev-proxy.ts
 var serverBuildId = "virtual:react-router/server-build";