@react-router/dev 7.9.0 → 7.9.1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # `@react-router/dev`
 
+## 7.9.1
+
+### Patch Changes
+
+- Fix internal `Future` interface naming from `middleware` -> `v8_middleware` ([#14327](https://github.com/remix-run/react-router/pull/14327))
+- Updated dependencies:
+  - `react-router@7.9.1`
+  - `@react-router/node@7.9.1`
+  - `@react-router/serve@7.9.1`
+
 ## 7.9.0
 
 ### Minor Changes

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v7.9.0
+ * @react-router/dev v7.9.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -424,7 +424,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,
@@ -465,7 +465,7 @@ async function resolveConfig({
         {
           id: "root",
           path: "",
-          file: rootRouteFile,
+          file: import_pathe3.default.relative(appDirectory, rootRouteFile),
           children: result.routeConfig
         }
       ];
@@ -812,7 +812,8 @@ var init_profiler = __esm({
 async function createContext2({
   rootDirectory,
   watch: watch2,
-  mode
+  mode,
+  rsc
 }) {
   const configLoader = await createConfigLoader({ rootDirectory, mode, watch: watch2 });
   const configResult = await configLoader.getConfig();
@@ -823,7 +824,8 @@ async function createContext2({
   return {
     configLoader,
     rootDirectory,
-    config
+    config,
+    rsc
   };
 }
 var init_context = __esm({
@@ -911,7 +913,7 @@ function generateFuture(ctx) {
 
     declare module "react-router" {
       interface Future {
-        middleware: ${ctx.config.future.v8_middleware}
+        v8_middleware: ${ctx.config.future.v8_middleware}
       }
     }
   `;
@@ -1116,7 +1118,7 @@ function getRouteAnnotations({
         module: Module
       }>
     ` + "\n\n" + generate(matchesType).code + "\n\n" + import_dedent.default`
-      type Annotations = GetAnnotations<Info & { module: Module, matches: Matches }>;
+      type Annotations = GetAnnotations<Info & { module: Module, matches: Matches }, ${ctx.rsc}>;
 
       export namespace Route {
         // links
@@ -1240,8 +1242,8 @@ async function write(...files) {
     })
   );
 }
-async function run(rootDirectory, { mode }) {
-  const ctx = await createContext2({ rootDirectory, mode, watch: false });
+async function run(rootDirectory, { mode, rsc }) {
+  const ctx = await createContext2({ rootDirectory, mode, rsc, watch: false });
   await import_promises.default.rm(typesDirectory(ctx), { recursive: true, force: true });
   await write(
     generateFuture(ctx),
@@ -1249,8 +1251,8 @@ async function run(rootDirectory, { mode }) {
     ...generateRoutes(ctx)
   );
 }
-async function watch(rootDirectory, { mode, logger }) {
-  const ctx = await createContext2({ rootDirectory, mode, watch: true });
+async function watch(rootDirectory, { mode, logger, rsc }) {
+  const ctx = await createContext2({ rootDirectory, mode, rsc, watch: true });
   await import_promises.default.rm(typesDirectory(ctx), { recursive: true, force: true });
   await write(
     generateFuture(ctx),
@@ -1489,6 +1491,13 @@ var init_with_props = __esm({
   }
 });
 
+// vite/load-dotenv.ts
+var init_load_dotenv = __esm({
+  "vite/load-dotenv.ts"() {
+    "use strict";
+  }
+});
+
 // vite/plugins/validate-plugin-order.ts
 var init_validate_plugin_order = __esm({
   "vite/plugins/validate-plugin-order.ts"() {
@@ -1776,6 +1785,7 @@ var init_plugin = __esm({
     init_config();
     init_optimize_deps_entries();
     init_with_props();
+    init_load_dotenv();
     init_validate_plugin_order();
     init_warn_on_client_source_maps();
     CLIENT_NON_COMPONENT_EXPORTS = [
@@ -2339,12 +2349,20 @@ async function createClientEntry(rootDirectory, appDirectory, inputFile) {
 }
 async function typegen(root, flags) {
   root = resolveRootDirectory(root, flags);
+  const rsc = await hasReactRouterRscPlugin({
+    root,
+    viteBuildOptions: {
+      config: flags.config,
+      mode: flags.mode
+    }
+  });
   if (flags.watch) {
     await preloadVite();
     const vite2 = getVite();
     const logger = vite2.createLogger("info", { prefix: "[react-router]" });
     await watch(root, {
       mode: flags.mode ?? "development",
+      rsc,
       logger
     });
     await new Promise(() => {
@@ -2352,7 +2370,8 @@ async function typegen(root, flags) {
     return;
   }
   await run(root, {
-    mode: flags.mode ?? "production"
+    mode: flags.mode ?? "production",
+    rsc
   });
 }
 

package/dist/config.js

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

package/dist/internal.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.9.0
+ * @react-router/dev v7.9.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -46,6 +46,7 @@ module.exports = __toCommonJS(internal_exports);
 
 // vite/rsc/plugin.ts
 var import_es_module_lexer2 = require("es-module-lexer");
+var Path5 = __toESM(require("pathe"));
 var babel = __toESM(require("@babel/core"));
 var import_picocolors4 = __toESM(require("picocolors"));
 
@@ -457,7 +458,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,
@@ -498,7 +499,7 @@ async function resolveConfig({
         {
           id: "root",
           path: "",
-          file: rootRouteFile,
+          file: import_pathe3.default.relative(appDirectory, rootRouteFile),
           children: result.routeConfig
         }
       ];
@@ -733,7 +734,8 @@ function isEntryFileDependency(moduleGraph, entryFilepath, filepath, visited = /
 async function createContext2({
   rootDirectory,
   watch: watch2,
-  mode
+  mode,
+  rsc
 }) {
   const configLoader = await createConfigLoader({ rootDirectory, mode, watch: watch2 });
   const configResult = await configLoader.getConfig();
@@ -744,7 +746,8 @@ async function createContext2({
   return {
     configLoader,
     rootDirectory,
-    config
+    config,
+    rsc
   };
 }
 
@@ -815,7 +818,7 @@ function generateFuture(ctx) {
 
     declare module "react-router" {
       interface Future {
-        middleware: ${ctx.config.future.v8_middleware}
+        v8_middleware: ${ctx.config.future.v8_middleware}
       }
     }
   `;
@@ -1021,7 +1024,7 @@ function getRouteAnnotations({
         module: Module
       }>
     ` + "\n\n" + generate(matchesType).code + "\n\n" + import_dedent.default`
-      type Annotations = GetAnnotations<Info & { module: Module, matches: Matches }>;
+      type Annotations = GetAnnotations<Info & { module: Module, matches: Matches }, ${ctx.rsc}>;
 
       export namespace Route {
         // links
@@ -1132,8 +1135,8 @@ async function write(...files) {
     })
   );
 }
-async function watch(rootDirectory, { mode, logger }) {
-  const ctx = await createContext2({ rootDirectory, mode, watch: true });
+async function watch(rootDirectory, { mode, logger, rsc }) {
+  const ctx = await createContext2({ rootDirectory, mode, rsc, watch: true });
   await import_promises.default.rm(typesDirectory(ctx), { recursive: true, force: true });
   await write(
     generateFuture(ctx),
@@ -1247,7 +1250,7 @@ function createVirtualRouteConfig({
     const routeId = route.id || createRouteId2(route.file, appDirectory);
     routeIdByFile.set(routeFile, routeId);
     code += `lazy: () => import(${JSON.stringify(
-      `${routeFile}?route-module${routeId === "root" ? "&root-route=true" : ""}`
+      `${routeFile}?route-module`
     )}),`;
     code += `id: ${JSON.stringify(routeId)},`;
     if (typeof route.path === "string") {
@@ -1483,26 +1486,38 @@ function transformVirtualRouteModules({
   code,
   viteCommand,
   routeIdByFile,
+  rootRouteFile,
   viteEnvironment
 }) {
   if (isVirtualRouteModuleId(id) || routeIdByFile.has(id)) {
     return createVirtualRouteModuleCode({
       id,
       code,
+      rootRouteFile,
       viteCommand,
       viteEnvironment
     });
   }
   if (isVirtualServerRouteModuleId(id)) {
-    return createVirtualServerRouteModuleCode({ id, code, viteEnvironment });
+    return createVirtualServerRouteModuleCode({
+      id,
+      code,
+      viteEnvironment
+    });
   }
   if (isVirtualClientRouteModuleId(id)) {
-    return createVirtualClientRouteModuleCode({ id, code, viteCommand });
+    return createVirtualClientRouteModuleCode({
+      id,
+      code,
+      rootRouteFile,
+      viteCommand
+    });
   }
 }
 async function createVirtualRouteModuleCode({
   id,
   code: routeSource,
+  rootRouteFile,
   viteCommand,
   viteEnvironment
 }) {
@@ -1562,7 +1577,7 @@ async function createVirtualRouteModuleCode({
       }
     }
   }
-  if (isRootRouteId(id) && !staticExports.includes("ErrorBoundary")) {
+  if (isRootRouteFile({ id, rootRouteFile }) && !staticExports.includes("ErrorBoundary")) {
     code += `export { ErrorBoundary } from "${clientModuleId}";
 `;
   }
@@ -1606,6 +1621,7 @@ function createVirtualServerRouteModuleCode({
 function createVirtualClientRouteModuleCode({
   id,
   code: routeSource,
+  rootRouteFile,
   viteCommand
 }) {
   const { staticExports, isServerFirstRoute, hasClientExports } = parseRouteExports(routeSource);
@@ -1616,7 +1632,7 @@ function createVirtualClientRouteModuleCode({
   removeExports(clientRouteModuleAst, exportsToRemove);
   const generatorResult = generate(clientRouteModuleAst);
   generatorResult.code = '"use client";' + generatorResult.code;
-  if (isRootRouteId(id) && !staticExports.includes("ErrorBoundary")) {
+  if (isRootRouteFile({ id, rootRouteFile }) && !staticExports.includes("ErrorBoundary")) {
     const hasRootLayout = staticExports.includes("Layout");
     generatorResult.code += `
 import { createElement as __rr_createElement } from "react";
@@ -1651,13 +1667,10 @@ function parseRouteExports(code) {
   };
 }
 function getVirtualClientModuleId(id) {
-  return `${id.split("?")[0]}?client-route-module${isRootRouteId(id) ? "&root-route=true" : ""}`;
+  return `${id.split("?")[0]}?client-route-module`;
 }
 function getVirtualServerModuleId(id) {
-  return `${id.split("?")[0]}?server-route-module${isRootRouteId(id) ? "&root-route=true" : ""}`;
-}
-function isRootRouteId(id) {
-  return /(\?|&)root-route=true(&|$)/.test(id);
+  return `${id.split("?")[0]}?server-route-module`;
 }
 function isVirtualRouteModuleId(id) {
   return /(\?|&)route-module(&|$)/.test(id);
@@ -1668,6 +1681,33 @@ function isVirtualClientRouteModuleId(id) {
 function isVirtualServerRouteModuleId(id) {
   return /(\?|&)server-route-module(&|$)/.test(id);
 }
+function isRootRouteFile({
+  id,
+  rootRouteFile
+}) {
+  const filePath = id.split("?")[0];
+  return filePath === rootRouteFile;
+}
+
+// vite/load-dotenv.ts
+async function loadDotenv({
+  rootDirectory,
+  viteUserConfig,
+  mode
+}) {
+  const vite2 = await import("vite");
+  Object.assign(
+    process.env,
+    vite2.loadEnv(
+      mode,
+      viteUserConfig.envDir ?? rootDirectory,
+      // We override the default prefix of "VITE_" with a blank string since
+      // we're targeting the server, so we want to load all environment
+      // variables, not just those explicitly marked for the client
+      ""
+    )
+  );
+}
 
 // vite/plugins/validate-plugin-order.ts
 function validatePluginOrder() {
@@ -1739,12 +1779,20 @@ function warnOnClientSourceMaps() {
 // vite/rsc/plugin.ts
 function reactRouterRSCVitePlugin() {
   let configLoader;
-  let config;
   let typegenWatcherPromise;
   let viteCommand;
   let routeIdByFile;
   let logger;
   const defaultEntries = getDefaultEntries();
+  let config;
+  let rootRouteFile;
+  function updateConfig(newConfig) {
+    config = newConfig;
+    rootRouteFile = Path5.resolve(
+      newConfig.appDirectory,
+      newConfig.routes.root.file
+    );
+  }
   return [
     {
       name: "react-router/rsc",
@@ -1783,12 +1831,17 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
         });
         const configResult = await configLoader.getConfig();
         if (!configResult.ok) throw new Error(configResult.error);
-        config = configResult.value;
+        updateConfig(configResult.value);
         if (viteUserConfig.base && config.basename !== "/" && viteCommand === "serve" && !viteUserConfig.server?.middlewareMode && !config.basename.startsWith(viteUserConfig.base)) {
           throw new Error(
             "When using the React Router `basename` and the Vite `base` config, the `basename` config must begin with `base` for the default Vite dev server."
           );
         }
+        await loadDotenv({
+          rootDirectory,
+          viteUserConfig,
+          mode
+        });
         const vite2 = await import("vite");
         logger = vite2.createLogger(viteUserConfig.logLevel, {
           prefix: "[react-router]"
@@ -1922,7 +1975,7 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
               clear: true,
               timestamp: true
             });
-            config = result.value;
+            updateConfig(result.value);
             if (configChanged || routeConfigChanged) {
               invalidateVirtualModules(viteDevServer);
             }
@@ -1942,6 +1995,7 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
             getRootDirectory(viteUserConfig),
             {
               mode,
+              rsc: true,
               // ignore `info` logs from typegen since they are
               // redundant when Vite plugin logs are active
               logger: vite2.createLogger("warn", {
@@ -1988,6 +2042,7 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
           id,
           viteCommand,
           routeIdByFile,
+          rootRouteFile,
           viteEnvironment: this.environment
         });
       }

package/dist/routes.js

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

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.9.0
+ * @react-router/dev v7.9.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -520,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,
@@ -561,7 +561,7 @@ async function resolveConfig({
         {
           id: "root",
           path: "",
-          file: rootRouteFile,
+          file: import_pathe3.default.relative(appDirectory, rootRouteFile),
           children: result.routeConfig
         }
       ];

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.9.0
+ * @react-router/dev v7.9.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -479,7 +479,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,
@@ -520,7 +520,7 @@ async function resolveConfig({
         {
           id: "root",
           path: "",
-          file: rootRouteFile,
+          file: import_pathe3.default.relative(appDirectory, rootRouteFile),
           children: result.routeConfig
         }
       ];
@@ -814,7 +814,8 @@ function isEntryFileDependency(moduleGraph, entryFilepath, filepath, visited = /
 async function createContext2({
   rootDirectory,
   watch: watch2,
-  mode
+  mode,
+  rsc
 }) {
   const configLoader = await createConfigLoader({ rootDirectory, mode, watch: watch2 });
   const configResult = await configLoader.getConfig();
@@ -825,7 +826,8 @@ async function createContext2({
   return {
     configLoader,
     rootDirectory,
-    config
+    config,
+    rsc
   };
 }
 
@@ -896,7 +898,7 @@ function generateFuture(ctx) {
 
     declare module "react-router" {
       interface Future {
-        middleware: ${ctx.config.future.v8_middleware}
+        v8_middleware: ${ctx.config.future.v8_middleware}
       }
     }
   `;
@@ -1102,7 +1104,7 @@ function getRouteAnnotations({
         module: Module
       }>
     ` + "\n\n" + generate(matchesType).code + "\n\n" + import_dedent.default`
-      type Annotations = GetAnnotations<Info & { module: Module, matches: Matches }>;
+      type Annotations = GetAnnotations<Info & { module: Module, matches: Matches }, ${ctx.rsc}>;
 
       export namespace Route {
         // links
@@ -1213,8 +1215,8 @@ async function write(...files) {
     })
   );
 }
-async function watch(rootDirectory, { mode, logger }) {
-  const ctx = await createContext2({ rootDirectory, mode, watch: true });
+async function watch(rootDirectory, { mode, logger, rsc }) {
+  const ctx = await createContext2({ rootDirectory, mode, rsc, watch: true });
   await import_promises.default.rm(typesDirectory(ctx), { recursive: true, force: true });
   await write(
     generateFuture(ctx),
@@ -2388,6 +2390,26 @@ function toFunctionExpression(decl) {
   );
 }
 
+// vite/load-dotenv.ts
+async function loadDotenv({
+  rootDirectory,
+  viteUserConfig,
+  mode
+}) {
+  const vite2 = await import("vite");
+  Object.assign(
+    process.env,
+    vite2.loadEnv(
+      mode,
+      viteUserConfig.envDir ?? rootDirectory,
+      // We override the default prefix of "VITE_" with a blank string since
+      // we're targeting the server, so we want to load all environment
+      // variables, not just those explicitly marked for the client
+      ""
+    )
+  );
+}
+
 // vite/plugins/validate-plugin-order.ts
 function validatePluginOrder() {
   return {
@@ -3152,6 +3174,7 @@ var reactRouterVitePlugin = () => {
         if (viteCommand === "serve") {
           typegenWatcherPromise = watch(rootDirectory, {
             mode,
+            rsc: false,
             // ignore `info` logs from typegen since they are redundant when Vite plugin logs are active
             logger: vite2.createLogger("warn", { prefix: "[react-router]" })
           });
@@ -3162,17 +3185,11 @@ var reactRouterVitePlugin = () => {
           watch: viteCommand === "serve"
         });
         await updatePluginContext();
-        Object.assign(
-          process.env,
-          vite2.loadEnv(
-            viteConfigEnv.mode,
-            viteUserConfig.envDir ?? ctx.rootDirectory,
-            // We override the default prefix of "VITE_" with a blank string since
-            // we're targeting the server, so we want to load all environment
-            // variables, not just those explicitly marked for the client
-            ""
-          )
-        );
+        await loadDotenv({
+          rootDirectory,
+          viteUserConfig,
+          mode
+        });
         let environments = await getEnvironmentsOptions(ctx, viteCommand, {
           viteUserConfig
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "7.9.0",
+  "version": "7.9.1",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -90,7 +90,7 @@
     "tinyglobby": "^0.2.14",
     "valibot": "^0.41.0",
     "vite-node": "^3.2.2",
-    "@react-router/node": "7.9.0"
+    "@react-router/node": "7.9.1"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -114,16 +114,16 @@
     "vite": "^6.1.0",
     "wireit": "0.14.9",
     "wrangler": "^4.23.0",
-    "@react-router/serve": "7.9.0",
-    "react-router": "^7.9.0"
+    "@react-router/serve": "7.9.1",
+    "react-router": "^7.9.1"
   },
   "peerDependencies": {
     "@vitejs/plugin-rsc": "*",
     "typescript": "^5.1.0",
     "vite": "^5.1.0 || ^6.0.0 || ^7.0.0",
     "wrangler": "^3.28.2 || ^4.0.0",
-    "@react-router/serve": "^7.9.0",
-    "react-router": "^7.9.0"
+    "@react-router/serve": "^7.9.1",
+    "react-router": "^7.9.1"
   },
   "peerDependenciesMeta": {
     "@vitejs/plugin-rsc": {