@react-router/dev 7.1.2 → 7.1.3

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # `@react-router/dev`
 
+## 7.1.3
+
+### Patch Changes
+
+- Fix `reveal` and `routes` CLI commands ([#12745](https://github.com/remix-run/react-router/pull/12745))
+- Updated dependencies:
+  - `react-router@7.1.3`
+  - `@react-router/node@7.1.3`
+  - `@react-router/serve@7.1.3`
+
 ## 7.1.2
 
 ### Patch Changes

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v7.1.2
+ * @react-router/dev v7.1.3
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -496,6 +496,15 @@ async function createConfigLoader({
     }
   };
 }
+async function loadConfig({ rootDirectory }) {
+  let configLoader = await createConfigLoader({
+    rootDirectory,
+    watch: false
+  });
+  let config = await configLoader.getConfig();
+  await configLoader.close();
+  return config;
+}
 function findEntry(dir, basename2, options) {
   for (let ext of entryExts) {
     let file = import_pathe3.default.resolve(dir, basename2 + ext);
@@ -586,6 +595,45 @@ var init_config = __esm({
   }
 });
 
+// vite/profiler.ts
+var import_node_fs2, import_node_path, import_picocolors2, getSession, start, profileCount, stop;
+var init_profiler = __esm({
+  "vite/profiler.ts"() {
+    "use strict";
+    import_node_fs2 = __toESM(require("fs"));
+    import_node_path = __toESM(require("path"));
+    import_picocolors2 = __toESM(require("picocolors"));
+    getSession = () => global.__reactRouter_profile_session;
+    start = async (callback) => {
+      let inspector = await import("inspector").then((r) => r.default);
+      let session = global.__reactRouter_profile_session = new inspector.Session();
+      session.connect();
+      session.post("Profiler.enable", () => {
+        session.post("Profiler.start", callback);
+      });
+    };
+    profileCount = 0;
+    stop = (log) => {
+      let session = getSession();
+      if (!session) return;
+      return new Promise((res, rej) => {
+        session.post("Profiler.stop", (err2, { profile }) => {
+          if (err2) return rej(err2);
+          let outPath = import_node_path.default.resolve(`./react-router-${profileCount++}.cpuprofile`);
+          import_node_fs2.default.writeFileSync(outPath, JSON.stringify(profile));
+          log(
+            import_picocolors2.default.yellow(
+              `CPU profile written to ${import_picocolors2.default.white(import_picocolors2.default.dim(outPath))}`
+            )
+          );
+          global.__reactRouter_profile_session = void 0;
+          res();
+        });
+      });
+    };
+  }
+});
+
 // typegen/paths.ts
 function getTypesDir(ctx) {
   return Path2.join(ctx.rootDirectory, ".react-router/types");
@@ -728,16 +776,16 @@ async function run(rootDirectory) {
 async function watch(rootDirectory, { logger } = {}) {
   const ctx = await createContext2({ rootDirectory, watch: true });
   await writeAll(ctx);
-  logger?.info(import_picocolors2.default.green("generated types"), { timestamp: true, clear: true });
+  logger?.info(import_picocolors3.default.green("generated types"), { timestamp: true, clear: true });
   ctx.configLoader.onChange(async ({ result, routeConfigChanged }) => {
     if (!result.ok) {
-      logger?.error(import_picocolors2.default.red(result.error), { timestamp: true, clear: true });
+      logger?.error(import_picocolors3.default.red(result.error), { timestamp: true, clear: true });
       return;
     }
     ctx.config = result.value;
     if (routeConfigChanged) {
       await writeAll(ctx);
-      logger?.info(import_picocolors2.default.green("regenerated types"), {
+      logger?.info(import_picocolors3.default.green("regenerated types"), {
         timestamp: true,
         clear: true
       });
@@ -765,21 +813,21 @@ async function createContext2({
 }
 async function writeAll(ctx) {
   const typegenDir = getTypesDir(ctx);
-  import_node_fs2.default.rmSync(typegenDir, { recursive: true, force: true });
+  import_node_fs3.default.rmSync(typegenDir, { recursive: true, force: true });
   Object.values(ctx.config.routes).forEach((route) => {
     const typesPath = getTypesPath(ctx, route);
     const content = generate(ctx, route);
-    import_node_fs2.default.mkdirSync(Path4.dirname(typesPath), { recursive: true });
-    import_node_fs2.default.writeFileSync(typesPath, content);
+    import_node_fs3.default.mkdirSync(Path4.dirname(typesPath), { recursive: true });
+    import_node_fs3.default.writeFileSync(typesPath, content);
   });
 }
-var import_node_fs2, Path4, import_picocolors2;
+var import_node_fs3, Path4, import_picocolors3;
 var init_typegen = __esm({
   "typegen/index.ts"() {
     "use strict";
-    import_node_fs2 = __toESM(require("fs"));
+    import_node_fs3 = __toESM(require("fs"));
     Path4 = __toESM(require("pathe"));
-    import_picocolors2 = __toESM(require("picocolors"));
+    import_picocolors3 = __toESM(require("picocolors"));
     init_config();
     init_generate();
     init_paths();
@@ -812,21 +860,21 @@ var init_node_adapter = __esm({
 });
 
 // vite/resolve-file-url.ts
-var path4;
+var path5;
 var init_resolve_file_url = __esm({
   "vite/resolve-file-url.ts"() {
     "use strict";
-    path4 = __toESM(require("path"));
+    path5 = __toESM(require("path"));
     init_vite();
   }
 });
 
 // vite/styles.ts
-var path5, import_react_router, cssFileRegExp, cssModulesRegExp;
+var path6, import_react_router, cssFileRegExp, cssModulesRegExp;
 var init_styles = __esm({
   "vite/styles.ts"() {
     "use strict";
-    path5 = __toESM(require("path"));
+    path6 = __toESM(require("path"));
     import_react_router = require("react-router");
     init_resolve_file_url();
     init_vite();
@@ -903,56 +951,19 @@ async function resolveViteConfig({
 async function extractPluginContext(viteConfig) {
   return viteConfig["__reactRouterPluginContext"];
 }
-async function loadPluginContext({
-  configFile,
-  root
-}) {
-  if (!root) {
-    root = process.env.REACT_ROUTER_ROOT || process.cwd();
-  }
-  configFile = configFile ?? findConfig(root, "vite.config", [
-    ".ts",
-    ".cts",
-    ".mts",
-    ".js",
-    ".cjs",
-    ".mjs"
-  ]);
-  if (!configFile) {
-    console.error(import_picocolors3.default.red("Vite config file not found"));
-    process.exit(1);
-  }
-  let viteConfig = await resolveViteConfig({ configFile, root });
-  let ctx = await extractPluginContext(viteConfig);
-  if (!ctx) {
-    console.error(
-      import_picocolors3.default.red("React Router Vite plugin not found in Vite config")
-    );
-    process.exit(1);
-  }
-  return ctx;
-}
-function findConfig(dir, basename2, extensions) {
-  for (let ext of extensions) {
-    let name = basename2 + ext;
-    let file = path6.join(dir, name);
-    if (fse.existsSync(file)) return file;
-  }
-  return void 0;
-}
-var import_node_crypto, path6, url, fse, babel, import_react_router2, import_es_module_lexer, import_jsesc, import_picocolors3, virtualHmrRuntime, virtualInjectHmrRuntime, virtual, getServerBuildDirectory, defaultEntriesDir, defaultEntries, REACT_REFRESH_HEADER;
+var import_node_crypto, path7, url, fse, babel2, import_react_router2, import_es_module_lexer, import_jsesc, import_picocolors4, virtualHmrRuntime, virtualInjectHmrRuntime, virtual, getServerBuildDirectory, defaultEntriesDir, defaultEntries, REACT_REFRESH_HEADER;
 var init_plugin = __esm({
   "vite/plugin.ts"() {
     "use strict";
     import_node_crypto = require("crypto");
-    path6 = __toESM(require("path"));
+    path7 = __toESM(require("path"));
     url = __toESM(require("url"));
     fse = __toESM(require("fs-extra"));
-    babel = __toESM(require("@babel/core"));
+    babel2 = __toESM(require("@babel/core"));
     import_react_router2 = require("react-router");
     import_es_module_lexer = require("es-module-lexer");
     import_jsesc = __toESM(require("jsesc"));
-    import_picocolors3 = __toESM(require("picocolors"));
+    import_picocolors4 = __toESM(require("picocolors"));
     init_typegen();
     init_invariant();
     init_babel();
@@ -972,18 +983,18 @@ var init_plugin = __esm({
       serverManifest: create("server-manifest"),
       browserManifest: create("browser-manifest")
     };
-    getServerBuildDirectory = (ctx) => path6.join(
+    getServerBuildDirectory = (ctx) => path7.join(
       ctx.reactRouterConfig.buildDirectory,
       "server",
       ...ctx.serverBundleBuildConfig ? [ctx.serverBundleBuildConfig.serverBundleId] : []
     );
-    defaultEntriesDir = path6.resolve(
-      path6.dirname(require.resolve("@react-router/dev/package.json")),
+    defaultEntriesDir = path7.resolve(
+      path7.dirname(require.resolve("@react-router/dev/package.json")),
       "dist",
       "config",
       "defaults"
     );
-    defaultEntries = fse.readdirSync(defaultEntriesDir).map((filename3) => path6.join(defaultEntriesDir, filename3));
+    defaultEntries = fse.readdirSync(defaultEntriesDir).map((filename3) => path7.join(defaultEntriesDir, filename3));
     invariant(defaultEntries.length > 0, "No default entries found");
     REACT_REFRESH_HEADER = `
 import RefreshRuntime from "${virtualHmrRuntime.id}";
@@ -1009,45 +1020,6 @@ if (import.meta.hot && !inWebWorker) {
   }
 });
 
-// vite/profiler.ts
-var import_node_fs3, import_node_path, import_picocolors4, getSession, start, profileCount, stop;
-var init_profiler = __esm({
-  "vite/profiler.ts"() {
-    "use strict";
-    import_node_fs3 = __toESM(require("fs"));
-    import_node_path = __toESM(require("path"));
-    import_picocolors4 = __toESM(require("picocolors"));
-    getSession = () => global.__reactRouter_profile_session;
-    start = async (callback) => {
-      let inspector = await import("inspector").then((r) => r.default);
-      let session = global.__reactRouter_profile_session = new inspector.Session();
-      session.connect();
-      session.post("Profiler.enable", () => {
-        session.post("Profiler.start", callback);
-      });
-    };
-    profileCount = 0;
-    stop = (log) => {
-      let session = getSession();
-      if (!session) return;
-      return new Promise((res, rej) => {
-        session.post("Profiler.stop", (err2, { profile }) => {
-          if (err2) return rej(err2);
-          let outPath = import_node_path.default.resolve(`./react-router-${profileCount++}.cpuprofile`);
-          import_node_fs3.default.writeFileSync(outPath, JSON.stringify(profile));
-          log(
-            import_picocolors4.default.yellow(
-              `CPU profile written to ${import_picocolors4.default.white(import_picocolors4.default.dim(outPath))}`
-            )
-          );
-          global.__reactRouter_profile_session = void 0;
-          res();
-        });
-      });
-    };
-  }
-});
-
 // vite/build.ts
 var build_exports = {};
 __export(build_exports, {
@@ -1347,6 +1319,8 @@ var import_fs_extra2 = __toESM(require("fs-extra"));
 var import_package_json2 = __toESM(require("@npmcli/package-json"));
 var import_exit_hook = __toESM(require("exit-hook"));
 var import_picocolors7 = __toESM(require("picocolors"));
+var import_react_router3 = require("react-router");
+init_config();
 
 // config/format.ts
 function formatRoutes(routeManifest, format) {
@@ -1404,16 +1378,13 @@ function formatRoutesAsJsx(routeManifest) {
   return output;
 }
 
-// cli/commands.ts
-init_plugin();
-
 // cli/useJavascript.ts
-var babel2 = __toESM(require("@babel/core"));
+var babel = __toESM(require("@babel/core"));
 var import_plugin_syntax_jsx = __toESM(require("@babel/plugin-syntax-jsx"));
 var import_preset_typescript = __toESM(require("@babel/preset-typescript"));
 var import_prettier = __toESM(require("prettier"));
 function transpile(tsx, options = {}) {
-  let mjs = babel2.transformSync(tsx, {
+  let mjs = babel.transformSync(tsx, {
     compact: false,
     cwd: options.cwd,
     filename: options.filename,
@@ -1430,18 +1401,14 @@ init_profiler();
 init_typegen();
 init_vite();
 async function routes(reactRouterRoot, flags = {}) {
-  let ctx = await loadPluginContext({
-    root: reactRouterRoot,
-    configFile: flags.config
-  });
-  if (!ctx) {
-    console.error(
-      import_picocolors7.default.red("React Router Vite plugin not found in Vite config")
-    );
+  let rootDirectory = reactRouterRoot ?? process.cwd();
+  let configResult = await loadConfig({ rootDirectory });
+  if (!configResult.ok) {
+    console.error(import_picocolors7.default.red(configResult.error));
     process.exit(1);
   }
   let format = flags.json ? "json" : "jsx";
-  console.log(formatRoutes(ctx.reactRouterConfig.routes, format));
+  console.log(formatRoutes(configResult.value.routes, format));
 }
 async function build2(root, options = {}) {
   if (!root) {
@@ -1475,17 +1442,18 @@ var conjunctionListFormat = new Intl.ListFormat("en", {
   type: "conjunction"
 });
 async function generateEntry(entry, reactRouterRoot, flags = {}) {
-  let ctx = await loadPluginContext({
-    root: reactRouterRoot,
-    configFile: flags.config
-  });
-  let rootDirectory = ctx.rootDirectory;
-  let appDirectory = ctx.reactRouterConfig.appDirectory;
   if (!entry) {
     await generateEntry("entry.client", reactRouterRoot, flags);
     await generateEntry("entry.server", reactRouterRoot, flags);
     return;
   }
+  let rootDirectory = reactRouterRoot ?? process.cwd();
+  let configResult = await loadConfig({ rootDirectory });
+  if (!configResult.ok) {
+    console.error(import_picocolors7.default.red(configResult.error));
+    return;
+  }
+  let appDirectory = configResult.value.appDirectory;
   if (!entries.includes(entry)) {
     let entriesArray = Array.from(entries);
     let list = conjunctionListFormat.format(entriesArray);

package/dist/config/defaults/entry.server.node.tsx

@@ -61,7 +61,7 @@ export default function handleRequest(
       }
     );
 
-    // Abort the rendering stream after the `streamTimeout` so it has tine to
+    // Abort the rendering stream after the `streamTimeout` so it has time to
     // flush down the rejected boundaries
     setTimeout(abort, streamTimeout + 1000);
   });

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.1.2
+ * @react-router/dev v7.1.3
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.1.2
+ * @react-router/dev v7.1.3
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.1.2
+ * @react-router/dev v7.1.3
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.1.2
+ * @react-router/dev v7.1.3
  *
  * Copyright (c) Remix Software Inc.
  *

package/package.json

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