@react-router/dev 0.0.0-experimental-1d760f6a6 → 0.0.0-experimental-701a32801

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-1d760f6a6
+ * @react-router/dev v0.0.0-experimental-701a32801
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -533,24 +533,13 @@ async function loadConfig({ rootDirectory }) {
   return config;
 }
 function findEntry(dir, basename2, options) {
-  let currentDir = import_pathe3.default.resolve(dir);
-  let { root } = import_pathe3.default.parse(currentDir);
-  while (true) {
-    for (let ext of options?.extensions ?? entryExts) {
-      let file = import_pathe3.default.resolve(currentDir, basename2 + ext);
-      if (import_node_fs.default.existsSync(file)) {
-        return options?.absolute ?? false ? file : import_pathe3.default.relative(dir, file);
-      }
-    }
-    if (!options?.walkParents) {
-      return void 0;
-    }
-    let parentDir = import_pathe3.default.dirname(currentDir);
-    if (currentDir === root || parentDir === currentDir) {
-      return void 0;
+  for (let ext of entryExts) {
+    let file = import_pathe3.default.resolve(dir, basename2 + ext);
+    if (import_node_fs.default.existsSync(file)) {
+      return options?.absolute ?? false ? file : import_pathe3.default.relative(dir, file);
     }
-    currentDir = parentDir;
   }
+  return void 0;
 }
 var import_node_fs, import_node_child_process, import_package_json, import_pathe3, import_chokidar, import_picocolors, import_pick2, import_omit, import_cloneDeep, import_isEqual, excludedConfigPresetKeys, mergeReactRouterConfig, deepFreeze, entryExts;
 var init_config = __esm({
@@ -1749,8 +1738,8 @@ function transpile(tsx, options = {}) {
 init_profiler();
 init_typegen();
 init_vite();
-async function routes(rootDirectory, flags = {}) {
-  rootDirectory = resolveRootDirectory(rootDirectory, flags);
+async function routes(reactRouterRoot, flags = {}) {
+  let rootDirectory = reactRouterRoot ?? process.cwd();
   let configResult = await loadConfig({ rootDirectory });
   if (!configResult.ok) {
     console.error(import_picocolors7.default.red(configResult.error));
@@ -1760,7 +1749,9 @@ async function routes(rootDirectory, flags = {}) {
   console.log(formatRoutes(configResult.value.routes, format));
 }
 async function build2(root, options = {}) {
-  root = resolveRootDirectory(root, options);
+  if (!root) {
+    root = process.env.REACT_ROUTER_ROOT || process.cwd();
+  }
   let { build: build3 } = await Promise.resolve().then(() => (init_build(), build_exports));
   if (options.profile) {
     await start();
@@ -1777,7 +1768,6 @@ async function dev2(root, options = {}) {
     await start();
   }
   (0, import_exit_hook.default)(() => stop(console.info));
-  root = resolveRootDirectory(root, options);
   await dev3(root, options);
   await new Promise(() => {
   });
@@ -1789,13 +1779,13 @@ var conjunctionListFormat = new Intl.ListFormat("en", {
   style: "long",
   type: "conjunction"
 });
-async function generateEntry(entry, rootDirectory, flags = {}) {
+async function generateEntry(entry, reactRouterRoot, flags = {}) {
   if (!entry) {
-    await generateEntry("entry.client", rootDirectory, flags);
-    await generateEntry("entry.server", rootDirectory, flags);
+    await generateEntry("entry.client", reactRouterRoot, flags);
+    await generateEntry("entry.server", reactRouterRoot, flags);
     return;
   }
-  rootDirectory = resolveRootDirectory(rootDirectory, flags);
+  let rootDirectory = reactRouterRoot ?? process.cwd();
   let configResult = await loadConfig({ rootDirectory });
   if (!configResult.ok) {
     console.error(import_picocolors7.default.red(configResult.error));
@@ -1851,12 +1841,6 @@ async function generateEntry(entry, rootDirectory, flags = {}) {
     )
   );
 }
-function resolveRootDirectory(root, flags) {
-  if (root) {
-    return path8.resolve(root);
-  }
-  return process.env.REACT_ROUTER_ROOT || (flags?.config ? path8.dirname(path8.resolve(flags.config)) : process.cwd());
-}
 async function checkForEntry(rootDirectory, appDirectory, entries2) {
   for (let entry of entries2) {
     let entryPath = path8.resolve(appDirectory, entry);
@@ -1879,7 +1863,7 @@ async function createClientEntry(rootDirectory, appDirectory, inputFile) {
   return contents;
 }
 async function typegen(root, flags) {
-  root = resolveRootDirectory(root, flags);
+  root ??= process.cwd();
   if (flags.watch) {
     await preloadVite();
     const vite2 = getVite();

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-1d760f6a6
+ * @react-router/dev v0.0.0-experimental-701a32801
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-1d760f6a6
+ * @react-router/dev v0.0.0-experimental-701a32801
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-1d760f6a6
+ * @react-router/dev v0.0.0-experimental-701a32801
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -627,24 +627,13 @@ async function loadConfig({ rootDirectory }) {
 }
 var entryExts = [".js", ".jsx", ".ts", ".tsx"];
 function findEntry(dir, basename, options) {
-  let currentDir = import_pathe3.default.resolve(dir);
-  let { root } = import_pathe3.default.parse(currentDir);
-  while (true) {
-    for (let ext of options?.extensions ?? entryExts) {
-      let file = import_pathe3.default.resolve(currentDir, basename + ext);
-      if (import_node_fs.default.existsSync(file)) {
-        return options?.absolute ?? false ? file : import_pathe3.default.relative(dir, file);
-      }
-    }
-    if (!options?.walkParents) {
-      return void 0;
-    }
-    let parentDir = import_pathe3.default.dirname(currentDir);
-    if (currentDir === root || parentDir === currentDir) {
-      return void 0;
+  for (let ext of entryExts) {
+    let file = import_pathe3.default.resolve(dir, basename + ext);
+    if (import_node_fs.default.existsSync(file)) {
+      return options?.absolute ?? false ? file : import_pathe3.default.relative(dir, file);
     }
-    currentDir = parentDir;
   }
+  return void 0;
 }
 
 // vite/cloudflare-dev-proxy.ts

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-1d760f6a6
+ * @react-router/dev v0.0.0-experimental-701a32801
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -595,18 +595,7 @@ async function resolveEntryFiles({
   let userEntryServerFile = findEntry(appDirectory, "entry.server");
   let entryServerFile;
   let entryClientFile = userEntryClientFile || "entry.client.tsx";
-  let packageJsonPath = findEntry(rootDirectory, "package", {
-    extensions: [".json"],
-    absolute: true,
-    walkParents: true
-  });
-  if (!packageJsonPath) {
-    throw new Error(
-      `Could not find package.json in ${rootDirectory} or any of its parent directories`
-    );
-  }
-  let packageJsonDirectory = import_pathe3.default.dirname(packageJsonPath);
-  let pkgJson = await import_package_json.default.load(packageJsonDirectory);
+  let pkgJson = await import_package_json.default.load(rootDirectory);
   let deps = pkgJson.content.dependencies ?? {};
   if (userEntryServerFile) {
     entryServerFile = userEntryServerFile;
@@ -629,7 +618,7 @@ async function resolveEntryFiles({
       await pkgJson.save();
       let packageManager = detectPackageManager() ?? "npm";
       (0, import_node_child_process.execSync)(`${packageManager} install`, {
-        cwd: packageJsonDirectory,
+        cwd: rootDirectory,
         stdio: "inherit"
       });
     }
@@ -641,24 +630,13 @@ async function resolveEntryFiles({
 }
 var entryExts = [".js", ".jsx", ".ts", ".tsx"];
 function findEntry(dir, basename2, options) {
-  let currentDir = import_pathe3.default.resolve(dir);
-  let { root } = import_pathe3.default.parse(currentDir);
-  while (true) {
-    for (let ext of options?.extensions ?? entryExts) {
-      let file = import_pathe3.default.resolve(currentDir, basename2 + ext);
-      if (import_node_fs.default.existsSync(file)) {
-        return options?.absolute ?? false ? file : import_pathe3.default.relative(dir, file);
-      }
-    }
-    if (!options?.walkParents) {
-      return void 0;
-    }
-    let parentDir = import_pathe3.default.dirname(currentDir);
-    if (currentDir === root || parentDir === currentDir) {
-      return void 0;
+  for (let ext of entryExts) {
+    let file = import_pathe3.default.resolve(dir, basename2 + ext);
+    if (import_node_fs.default.existsSync(file)) {
+      return options?.absolute ?? false ? file : import_pathe3.default.relative(dir, file);
     }
-    currentDir = parentDir;
   }
+  return void 0;
 }
 
 // vite/babel.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-1d760f6a6",
+  "version": "0.0.0-experimental-701a32801",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -86,7 +86,7 @@
     "set-cookie-parser": "^2.6.0",
     "valibot": "^0.41.0",
     "vite-node": "3.0.0-beta.2",
-    "@react-router/node": "0.0.0-experimental-1d760f6a6"
+    "@react-router/node": "0.0.0-experimental-701a32801"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -110,15 +110,15 @@
     "vite": "^6.1.0",
     "wireit": "0.14.9",
     "wrangler": "^4.2.0",
-    "@react-router/serve": "0.0.0-experimental-1d760f6a6",
-    "react-router": "^0.0.0-experimental-1d760f6a6"
+    "@react-router/serve": "0.0.0-experimental-701a32801",
+    "react-router": "^0.0.0-experimental-701a32801"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0 || ^6.0.0",
     "wrangler": "^3.28.2 || ^4.0.0",
-    "@react-router/serve": "^0.0.0-experimental-1d760f6a6",
-    "react-router": "^0.0.0-experimental-1d760f6a6"
+    "@react-router/serve": "^0.0.0-experimental-701a32801",
+    "react-router": "^0.0.0-experimental-701a32801"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {