@react-router/dev 7.8.2 → 7.9.0-pre.0

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.8.2
+ * @react-router/dev v7.9.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -48,15 +48,14 @@ module.exports = __toCommonJS(vite_exports);
 var import_node_crypto = require("crypto");
 var import_node_fs2 = require("fs");
 var import_promises2 = require("fs/promises");
-var path5 = __toESM(require("path"));
+var path6 = __toESM(require("path"));
 var url = __toESM(require("url"));
 var babel = __toESM(require("@babel/core"));
 var import_react_router2 = require("react-router");
 var import_es_module_lexer = require("es-module-lexer");
-var import_tinyglobby = require("tinyglobby");
 var import_pick3 = __toESM(require("lodash/pick"));
 var import_jsesc = __toESM(require("jsesc"));
-var import_picocolors3 = __toESM(require("picocolors"));
+var import_picocolors4 = __toESM(require("picocolors"));
 var import_kebabCase = __toESM(require("lodash/kebabCase"));
 
 // typegen/index.ts
@@ -247,7 +246,7 @@ function validateRouteConfig({
         `Route config in "${routeConfigFile}" is invalid.`,
         root ? `${root}` : [],
         nested ? Object.entries(nested).map(
-          ([path6, message]) => `Path: routes.${path6}
+          ([path7, message]) => `Path: routes.${path7}
 ${message}`
         ) : []
       ].flat().join("\n\n")
@@ -367,7 +366,8 @@ async function resolveConfig({
   root,
   viteNodeContext,
   reactRouterConfigFile,
-  skipRoutes
+  skipRoutes,
+  validateConfig
 }) {
   let reactRouterUserConfig = {};
   if (reactRouterConfigFile) {
@@ -385,6 +385,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}`);
     }
@@ -533,7 +539,7 @@ async function resolveConfig({
     }
   }
   let future = {
-    unstable_middleware: reactRouterUserConfig.future?.unstable_middleware ?? false,
+    v8_middleware: reactRouterUserConfig.future?.v8_middleware ?? false,
     unstable_optimizeDeps: reactRouterUserConfig.future?.unstable_optimizeDeps ?? false,
     unstable_splitRouteModules: reactRouterUserConfig.future?.unstable_splitRouteModules ?? false,
     unstable_subResourceIntegrity: reactRouterUserConfig.future?.unstable_subResourceIntegrity ?? false,
@@ -563,7 +569,8 @@ async function createConfigLoader({
   rootDirectory: root,
   watch: watch2,
   mode,
-  skipRoutes
+  skipRoutes,
+  validateConfig
 }) {
   root = import_pathe3.default.normalize(root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd());
   let vite2 = await import("vite");
@@ -582,7 +589,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) {
@@ -604,11 +617,11 @@ async function createConfigLoader({
       if (!fsWatcher) {
         fsWatcher = import_chokidar.default.watch([root, appDirectory], {
           ignoreInitial: true,
-          ignored: (path6) => {
-            let dirname4 = import_pathe3.default.dirname(path6);
+          ignored: (path7) => {
+            let dirname4 = import_pathe3.default.dirname(path7);
             return !dirname4.startsWith(appDirectory) && // Ensure we're only watching files outside of the app directory
             // that are at the root level, not nested in subdirectories
-            path6 !== root && // Watch the root directory itself
+            path7 !== root && // Watch the root directory itself
             dirname4 !== root;
           }
         });
@@ -867,7 +880,7 @@ function fullpath(lineage2) {
   if (lineage2.length === 1 && route?.id === "root") return "/";
   const isLayout = route && route.index !== true && route.path === void 0;
   if (isLayout) return void 0;
-  return "/" + lineage2.map((route2) => route2.path?.replace(/^\//, "")?.replace(/\/$/, "")).filter((path6) => path6 !== void 0 && path6 !== "").join("/");
+  return "/" + lineage2.map((route2) => route2.path?.replace(/^\//, "")?.replace(/\/$/, "")).filter((path7) => path7 !== void 0 && path7 !== "").join("/");
 }
 
 // typegen/generate.ts
@@ -883,7 +896,7 @@ function generateFuture(ctx) {
 
     declare module "react-router" {
       interface Future {
-        unstable_middleware: ${ctx.config.future.unstable_middleware}
+        middleware: ${ctx.config.future.v8_middleware}
       }
     }
   `;
@@ -1023,8 +1036,8 @@ function routeFilesType({
   );
 }
 function isInAppDirectory(ctx, routeFile) {
-  const path6 = Path3.resolve(ctx.config.appDirectory, routeFile);
-  return path6.startsWith(ctx.config.appDirectory);
+  const path7 = Path3.resolve(ctx.config.appDirectory, routeFile);
+  return path7.startsWith(ctx.config.appDirectory);
 }
 function getRouteAnnotations({
   ctx,
@@ -1105,11 +1118,11 @@ function getRouteAnnotations({
         export type HeadersArgs = Annotations["HeadersArgs"];
         export type HeadersFunction = Annotations["HeadersFunction"];
 
-        // unstable_middleware
-        export type unstable_MiddlewareFunction = Annotations["unstable_MiddlewareFunction"];
+        // middleware
+        export type MiddlewareFunction = Annotations["MiddlewareFunction"];
 
-        // unstable_clientMiddleware
-        export type unstable_ClientMiddlewareFunction = Annotations["unstable_ClientMiddlewareFunction"];
+        // clientMiddleware
+        export type ClientMiddlewareFunction = Annotations["ClientMiddlewareFunction"];
 
         // loader
         export type LoaderArgs = Annotations["LoaderArgs"];
@@ -1136,21 +1149,21 @@ function getRouteAnnotations({
   return { filename: filename2, content };
 }
 function relativeImportSource(from, to) {
-  let path6 = Path3.relative(Path3.dirname(from), to);
-  let extension = Path3.extname(path6);
-  path6 = Path3.join(Path3.dirname(path6), Pathe.filename(path6));
-  if (!path6.startsWith("../")) path6 = "./" + path6;
+  let path7 = Path3.relative(Path3.dirname(from), to);
+  let extension = Path3.extname(path7);
+  path7 = Path3.join(Path3.dirname(path7), Pathe.filename(path7));
+  if (!path7.startsWith("../")) path7 = "./" + path7;
   if (!extension || /\.(js|ts)x?$/.test(extension)) {
     extension = ".js";
   }
-  return path6 + extension;
+  return path7 + extension;
 }
 function rootDirsPath(ctx, typesPath) {
   const rel = Path3.relative(typesDirectory(ctx), typesPath);
   return Path3.join(ctx.rootDirectory, rel);
 }
-function paramsType(path6) {
-  const params = parse2(path6);
+function paramsType(path7) {
+  const params = parse2(path7);
   return t2.tsTypeLiteral(
     Object.entries(params).map(([param, isRequired]) => {
       const property = t2.tsPropertySignature(
@@ -1486,11 +1499,11 @@ var getCssStringFromViteDevModuleCode = (code) => {
   let cssContent = void 0;
   const ast = import_parser.parse(code, { sourceType: "module" });
   traverse(ast, {
-    VariableDeclaration(path6) {
-      const declaration = path6.node.declarations[0];
+    VariableDeclaration(path7) {
+      const declaration = path7.node.declarations[0];
       if (declaration?.id?.type === "Identifier" && declaration.id.name === "__vite__css" && declaration.init?.type === "StringLiteral") {
         cssContent = declaration.init.value;
-        path6.stop();
+        path7.stop();
       }
     }
   });
@@ -1507,6 +1520,15 @@ function create(name) {
   };
 }
 
+// vite/resolve-relative-route-file-path.ts
+var import_pathe4 = __toESM(require("pathe"));
+function resolveRelativeRouteFilePath(route, reactRouterConfig) {
+  let vite2 = getVite();
+  let file = route.file;
+  let fullPath = import_pathe4.default.resolve(reactRouterConfig.appDirectory, file);
+  return vite2.normalizePath(fullPath);
+}
+
 // vite/combine-urls.ts
 function combineURLs(baseURL, relativeURL) {
   return relativeURL ? baseURL.replace(/\/+$/, "") + "/" + relativeURL.replace(/^\/+/, "") : baseURL;
@@ -1520,10 +1542,10 @@ var removeExports = (ast, exportsToRemove) => {
   let markedForRemoval = /* @__PURE__ */ new Set();
   let removedExportLocalNames = /* @__PURE__ */ new Set();
   traverse(ast, {
-    ExportDeclaration(path6) {
-      if (path6.node.type === "ExportNamedDeclaration") {
-        if (path6.node.specifiers.length) {
-          path6.node.specifiers = path6.node.specifiers.filter((specifier) => {
+    ExportDeclaration(path7) {
+      if (path7.node.type === "ExportNamedDeclaration") {
+        if (path7.node.specifiers.length) {
+          path7.node.specifiers = path7.node.specifiers.filter((specifier) => {
             if (specifier.type === "ExportSpecifier" && specifier.exported.type === "Identifier") {
               if (exportsToRemove.includes(specifier.exported.name)) {
                 exportsFiltered = true;
@@ -1535,12 +1557,12 @@ var removeExports = (ast, exportsToRemove) => {
             }
             return true;
           });
-          if (path6.node.specifiers.length === 0) {
-            markedForRemoval.add(path6);
+          if (path7.node.specifiers.length === 0) {
+            markedForRemoval.add(path7);
           }
         }
-        if (path6.node.declaration?.type === "VariableDeclaration") {
-          let declaration = path6.node.declaration;
+        if (path7.node.declaration?.type === "VariableDeclaration") {
+          let declaration = path7.node.declaration;
           declaration.declarations = declaration.declarations.filter(
             (declaration2) => {
               if (declaration2.id.type === "Identifier" && exportsToRemove.includes(declaration2.id.name)) {
@@ -1554,30 +1576,30 @@ var removeExports = (ast, exportsToRemove) => {
             }
           );
           if (declaration.declarations.length === 0) {
-            markedForRemoval.add(path6);
+            markedForRemoval.add(path7);
           }
         }
-        if (path6.node.declaration?.type === "FunctionDeclaration") {
-          let id = path6.node.declaration.id;
+        if (path7.node.declaration?.type === "FunctionDeclaration") {
+          let id = path7.node.declaration.id;
           if (id && exportsToRemove.includes(id.name)) {
-            markedForRemoval.add(path6);
+            markedForRemoval.add(path7);
           }
         }
-        if (path6.node.declaration?.type === "ClassDeclaration") {
-          let id = path6.node.declaration.id;
+        if (path7.node.declaration?.type === "ClassDeclaration") {
+          let id = path7.node.declaration.id;
           if (id && exportsToRemove.includes(id.name)) {
-            markedForRemoval.add(path6);
+            markedForRemoval.add(path7);
           }
         }
       }
-      if (path6.node.type === "ExportDefaultDeclaration") {
+      if (path7.node.type === "ExportDefaultDeclaration") {
         if (exportsToRemove.includes("default")) {
-          markedForRemoval.add(path6);
-          if (path6.node.declaration) {
-            if (path6.node.declaration.type === "Identifier") {
-              removedExportLocalNames.add(path6.node.declaration.name);
-            } else if ((path6.node.declaration.type === "FunctionDeclaration" || path6.node.declaration.type === "ClassDeclaration") && path6.node.declaration.id) {
-              removedExportLocalNames.add(path6.node.declaration.id.name);
+          markedForRemoval.add(path7);
+          if (path7.node.declaration) {
+            if (path7.node.declaration.type === "Identifier") {
+              removedExportLocalNames.add(path7.node.declaration.name);
+            } else if ((path7.node.declaration.type === "FunctionDeclaration" || path7.node.declaration.type === "ClassDeclaration") && path7.node.declaration.id) {
+              removedExportLocalNames.add(path7.node.declaration.id.name);
             }
           }
         }
@@ -1585,21 +1607,21 @@ var removeExports = (ast, exportsToRemove) => {
     }
   });
   traverse(ast, {
-    ExpressionStatement(path6) {
-      if (!path6.parentPath.isProgram()) {
+    ExpressionStatement(path7) {
+      if (!path7.parentPath.isProgram()) {
         return;
       }
-      if (path6.node.expression.type === "AssignmentExpression") {
-        const left = path6.node.expression.left;
+      if (path7.node.expression.type === "AssignmentExpression") {
+        const left = path7.node.expression.left;
         if (left.type === "MemberExpression" && left.object.type === "Identifier" && (exportsToRemove.includes(left.object.name) || removedExportLocalNames.has(left.object.name))) {
-          markedForRemoval.add(path6);
+          markedForRemoval.add(path7);
         }
       }
     }
   });
   if (markedForRemoval.size > 0 || exportsFiltered) {
-    for (let path6 of markedForRemoval) {
-      path6.remove();
+    for (let path7 of markedForRemoval) {
+      path7.remove();
     }
     (0, import_babel_dead_code_elimination.deadCodeElimination)(ast, previouslyReferencedIdentifiers);
   }
@@ -1644,6 +1666,18 @@ function invalidDestructureError(name) {
   return new Error(`Cannot remove destructured export "${name}"`);
 }
 
+// vite/has-dependency.ts
+function hasDependency({
+  name,
+  rootDirectory
+}) {
+  try {
+    return Boolean(require.resolve(name, { paths: [rootDirectory] }));
+  } catch (err2) {
+    return false;
+  }
+}
+
 // vite/cache.ts
 function getOrSetFromCache(cache, key, version, getValue) {
   if (!cache) {
@@ -1670,28 +1704,28 @@ function codeToAst(code, cache, cacheKey) {
     )
   );
 }
-function assertNodePath(path6) {
+function assertNodePath(path7) {
   invariant(
-    path6 && !Array.isArray(path6),
-    `Expected a Path, but got ${Array.isArray(path6) ? "an array" : path6}`
+    path7 && !Array.isArray(path7),
+    `Expected a Path, but got ${Array.isArray(path7) ? "an array" : path7}`
   );
 }
-function assertNodePathIsStatement(path6) {
+function assertNodePathIsStatement(path7) {
   invariant(
-    path6 && !Array.isArray(path6) && t.isStatement(path6.node),
-    `Expected a Statement path, but got ${Array.isArray(path6) ? "an array" : path6?.node?.type}`
+    path7 && !Array.isArray(path7) && t.isStatement(path7.node),
+    `Expected a Statement path, but got ${Array.isArray(path7) ? "an array" : path7?.node?.type}`
   );
 }
-function assertNodePathIsVariableDeclarator(path6) {
+function assertNodePathIsVariableDeclarator(path7) {
   invariant(
-    path6 && !Array.isArray(path6) && t.isVariableDeclarator(path6.node),
-    `Expected an Identifier path, but got ${Array.isArray(path6) ? "an array" : path6?.node?.type}`
+    path7 && !Array.isArray(path7) && t.isVariableDeclarator(path7.node),
+    `Expected an Identifier path, but got ${Array.isArray(path7) ? "an array" : path7?.node?.type}`
   );
 }
-function assertNodePathIsPattern(path6) {
+function assertNodePathIsPattern(path7) {
   invariant(
-    path6 && !Array.isArray(path6) && t.isPattern(path6.node),
-    `Expected a Pattern path, but got ${Array.isArray(path6) ? "an array" : path6?.node?.type}`
+    path7 && !Array.isArray(path7) && t.isPattern(path7.node),
+    `Expected a Pattern path, but got ${Array.isArray(path7) ? "an array" : path7?.node?.type}`
   );
 }
 function getExportDependencies(code, cache, cacheKey) {
@@ -1727,8 +1761,8 @@ function getExportDependencies(code, cache, cacheKey) {
           }
           let isWithinExportDestructuring = Boolean(
             identifier.findParent(
-              (path6) => Boolean(
-                path6.isPattern() && path6.parentPath?.isVariableDeclarator() && path6.parentPath.parentPath?.parentPath?.isExportNamedDeclaration()
+              (path7) => Boolean(
+                path7.isPattern() && path7.parentPath?.isVariableDeclarator() && path7.parentPath.parentPath?.parentPath?.isExportNamedDeclaration()
               )
             )
           );
@@ -1806,7 +1840,7 @@ function getExportDependencies(code, cache, cacheKey) {
             for (let specifier of node.specifiers) {
               if (t.isIdentifier(specifier.exported)) {
                 let name = specifier.exported.name;
-                let specifierPath = exportPath.get("specifiers").find((path6) => path6.node === specifier);
+                let specifierPath = exportPath.get("specifiers").find((path7) => path7.node === specifier);
                 invariant(
                   specifierPath,
                   `Expected to find specifier path for ${name}`
@@ -1823,22 +1857,22 @@ function getExportDependencies(code, cache, cacheKey) {
     }
   );
 }
-function getDependentIdentifiersForPath(path6, state) {
+function getDependentIdentifiersForPath(path7, state) {
   let { visited, identifiers } = state ?? {
     visited: /* @__PURE__ */ new Set(),
     identifiers: /* @__PURE__ */ new Set()
   };
-  if (visited.has(path6)) {
+  if (visited.has(path7)) {
     return identifiers;
   }
-  visited.add(path6);
-  path6.traverse({
-    Identifier(path7) {
-      if (identifiers.has(path7)) {
+  visited.add(path7);
+  path7.traverse({
+    Identifier(path8) {
+      if (identifiers.has(path8)) {
         return;
       }
-      identifiers.add(path7);
-      let binding = path7.scope.getBinding(path7.node.name);
+      identifiers.add(path8);
+      let binding = path8.scope.getBinding(path8.node.name);
       if (!binding) {
         return;
       }
@@ -1860,7 +1894,7 @@ function getDependentIdentifiersForPath(path6, state) {
       }
     }
   });
-  let topLevelStatement = getTopLevelStatementPathForPath(path6);
+  let topLevelStatement = getTopLevelStatementPathForPath(path7);
   let withinImportStatement = topLevelStatement.isImportDeclaration();
   let withinExportStatement = topLevelStatement.isExportDeclaration();
   if (!withinImportStatement && !withinExportStatement) {
@@ -1869,9 +1903,9 @@ function getDependentIdentifiersForPath(path6, state) {
       identifiers
     });
   }
-  if (withinExportStatement && path6.isIdentifier() && (t.isPattern(path6.parentPath.node) || // [foo]
-  t.isPattern(path6.parentPath.parentPath?.node))) {
-    let variableDeclarator = path6.findParent((p) => p.isVariableDeclarator());
+  if (withinExportStatement && path7.isIdentifier() && (t.isPattern(path7.parentPath.node) || // [foo]
+  t.isPattern(path7.parentPath.parentPath?.node))) {
+    let variableDeclarator = path7.findParent((p) => p.isVariableDeclarator());
     assertNodePath(variableDeclarator);
     getDependentIdentifiersForPath(variableDeclarator, {
       visited,
@@ -1880,16 +1914,16 @@ function getDependentIdentifiersForPath(path6, state) {
   }
   return identifiers;
 }
-function getTopLevelStatementPathForPath(path6) {
-  let ancestry = path6.getAncestry();
+function getTopLevelStatementPathForPath(path7) {
+  let ancestry = path7.getAncestry();
   let topLevelStatement = ancestry[ancestry.length - 2];
   assertNodePathIsStatement(topLevelStatement);
   return topLevelStatement;
 }
 function getTopLevelStatementsForPaths(paths) {
   let topLevelStatements = /* @__PURE__ */ new Set();
-  for (let path6 of paths) {
-    let topLevelStatement = getTopLevelStatementPathForPath(path6);
+  for (let path7 of paths) {
+    let topLevelStatement = getTopLevelStatementPathForPath(path7);
     topLevelStatements.add(topLevelStatement.node);
   }
   return topLevelStatements;
@@ -2210,7 +2244,7 @@ function detectRouteChunks(code, cache, cacheKey) {
 var routeChunkExportNames = [
   "clientAction",
   "clientLoader",
-  "unstable_clientMiddleware",
+  "clientMiddleware",
   "HydrateFallback"
 ];
 var mainChunkName = "main";
@@ -2226,7 +2260,7 @@ var routeChunkQueryStrings = {
   main: `${routeChunkQueryStringPrefix}main`,
   clientAction: `${routeChunkQueryStringPrefix}clientAction`,
   clientLoader: `${routeChunkQueryStringPrefix}clientLoader`,
-  unstable_clientMiddleware: `${routeChunkQueryStringPrefix}unstable_clientMiddleware`,
+  clientMiddleware: `${routeChunkQueryStringPrefix}clientMiddleware`,
   HydrateFallback: `${routeChunkQueryStringPrefix}HydrateFallback`
 };
 function getRouteChunkModuleId(filePath, chunkName) {
@@ -2251,6 +2285,31 @@ function getRouteChunkNameFromModuleId(id) {
   return chunkName;
 }
 
+// vite/optimize-deps-entries.ts
+var import_tinyglobby = require("tinyglobby");
+function getOptimizeDepsEntries({
+  entryClientFilePath,
+  reactRouterConfig
+}) {
+  if (!reactRouterConfig.future.unstable_optimizeDeps) {
+    return [];
+  }
+  const vite2 = getVite();
+  const viteMajorVersion = parseInt(vite2.version.split(".")[0], 10);
+  return [
+    vite2.normalizePath(entryClientFilePath),
+    ...Object.values(reactRouterConfig.routes).map(
+      (route) => resolveRelativeRouteFilePath(route, reactRouterConfig)
+    )
+  ].map(
+    (entry) => (
+      // In Vite 7, the `optimizeDeps.entries` option only accepts glob patterns.
+      // In prior versions, absolute file paths were treated differently.
+      viteMajorVersion >= 7 ? (0, import_tinyglobby.escapePath)(entry) : entry
+    )
+  );
+}
+
 // vite/with-props.ts
 var namedComponentExports = ["HydrateFallback", "ErrorBoundary"];
 function isNamedComponentExport(name) {
@@ -2258,24 +2317,24 @@ function isNamedComponentExport(name) {
 }
 var decorateComponentExportsWithProps = (ast) => {
   const hocs = [];
-  function getHocUid(path6, hocName) {
-    const uid = path6.scope.generateUidIdentifier(hocName);
+  function getHocUid(path7, hocName) {
+    const uid = path7.scope.generateUidIdentifier(hocName);
     hocs.push([hocName, uid]);
     return uid;
   }
   traverse(ast, {
-    ExportDeclaration(path6) {
-      if (path6.isExportDefaultDeclaration()) {
-        const declaration = path6.get("declaration");
+    ExportDeclaration(path7) {
+      if (path7.isExportDefaultDeclaration()) {
+        const declaration = path7.get("declaration");
         const expr = declaration.isExpression() ? declaration.node : declaration.isFunctionDeclaration() ? toFunctionExpression(declaration.node) : void 0;
         if (expr) {
-          const uid = getHocUid(path6, "UNSAFE_withComponentProps");
+          const uid = getHocUid(path7, "UNSAFE_withComponentProps");
           declaration.replaceWith(t.callExpression(uid, [expr]));
         }
         return;
       }
-      if (path6.isExportNamedDeclaration()) {
-        const decl = path6.get("declaration");
+      if (path7.isExportNamedDeclaration()) {
+        const decl = path7.get("declaration");
         if (decl.isVariableDeclaration()) {
           decl.get("declarations").forEach((varDeclarator) => {
             const id = varDeclarator.get("id");
@@ -2285,7 +2344,7 @@ var decorateComponentExportsWithProps = (ast) => {
             if (!id.isIdentifier()) return;
             const { name } = id.node;
             if (!isNamedComponentExport(name)) return;
-            const uid = getHocUid(path6, `UNSAFE_with${name}Props`);
+            const uid = getHocUid(path7, `UNSAFE_with${name}Props`);
             init.replaceWith(t.callExpression(uid, [expr]));
           });
           return;
@@ -2295,7 +2354,7 @@ var decorateComponentExportsWithProps = (ast) => {
           if (!id) return;
           const { name } = id;
           if (!isNamedComponentExport(name)) return;
-          const uid = getHocUid(path6, `UNSAFE_with${name}Props`);
+          const uid = getHocUid(path7, `UNSAFE_with${name}Props`);
           decl.replaceWith(
             t.variableDeclaration("const", [
               t.variableDeclarator(
@@ -2340,16 +2399,57 @@ function validatePluginOrder() {
           (plugin) => pluginName.includes(plugin.name)
         );
       };
-      let rollupPrePlugins = [
-        { pluginName: "@mdx-js/rollup", displayName: "@mdx-js/rollup" }
-      ];
-      for (let prePlugin of rollupPrePlugins) {
-        let prePluginIndex = pluginIndex(prePlugin.pluginName);
-        if (prePluginIndex >= 0 && prePluginIndex > pluginIndex(["react-router", "react-router/rsc"])) {
-          throw new Error(
-            `The "${prePlugin.displayName}" plugin should be placed before the React Router plugin in your Vite config file`
-          );
-        }
+      let reactRouterRscPluginIndex = pluginIndex("react-router/rsc");
+      let viteRscPluginIndex = pluginIndex("rsc");
+      if (reactRouterRscPluginIndex >= 0 && viteRscPluginIndex >= 0 && reactRouterRscPluginIndex > viteRscPluginIndex) {
+        throw new Error(
+          `The "@vitejs/plugin-rsc" plugin should be placed after the React Router RSC plugin in your Vite config`
+        );
+      }
+      let reactRouterPluginIndex = pluginIndex([
+        "react-router",
+        "react-router/rsc"
+      ]);
+      let mdxPluginIndex = pluginIndex("@mdx-js/rollup");
+      if (mdxPluginIndex >= 0 && mdxPluginIndex > reactRouterPluginIndex) {
+        throw new Error(
+          `The "@mdx-js/rollup" plugin should be placed before the React Router plugin in your Vite config`
+        );
+      }
+    }
+  };
+}
+
+// vite/plugins/warn-on-client-source-maps.ts
+var import_picocolors3 = __toESM(require("picocolors"));
+function warnOnClientSourceMaps() {
+  let viteConfig;
+  let viteCommand;
+  let logged = false;
+  return {
+    name: "react-router:warn-on-client-source-maps",
+    config(_, configEnv) {
+      viteCommand = configEnv.command;
+    },
+    configResolved(config) {
+      viteConfig = config;
+    },
+    buildStart() {
+      invariant(viteConfig);
+      if (!logged && viteCommand === "build" && viteConfig.mode === "production" && !viteConfig.build.ssr && (viteConfig.build.sourcemap || viteConfig.environments?.client?.build.sourcemap)) {
+        viteConfig.logger.warn(
+          import_picocolors3.default.yellow(
+            "\n" + import_picocolors3.default.bold("  \u26A0\uFE0F  Source maps are enabled in production\n") + [
+              "This makes your server code publicly",
+              "visible in the browser. This is highly",
+              "discouraged! If you insist, ensure that",
+              "you are using environment variables for",
+              "secrets and not hard-coding them in",
+              "your source code."
+            ].map((line) => "     " + line).join("\n") + "\n"
+          )
+        );
+        logged = true;
       }
     }
   };
@@ -2359,16 +2459,11 @@ function validatePluginOrder() {
 function extractPluginContext(viteConfig) {
   return viteConfig["__reactRouterPluginContext"];
 }
-var SERVER_ONLY_ROUTE_EXPORTS = [
-  "loader",
-  "action",
-  "unstable_middleware",
-  "headers"
-];
+var SERVER_ONLY_ROUTE_EXPORTS = ["loader", "action", "middleware", "headers"];
 var CLIENT_NON_COMPONENT_EXPORTS = [
   "clientAction",
   "clientLoader",
-  "unstable_clientMiddleware",
+  "clientMiddleware",
   "handle",
   "meta",
   "links",
@@ -2421,16 +2516,10 @@ var virtualHmrRuntime = create("hmr-runtime");
 var virtualInjectHmrRuntime = create("inject-hmr-runtime");
 var normalizeRelativeFilePath = (file, reactRouterConfig) => {
   let vite2 = getVite();
-  let fullPath = path5.resolve(reactRouterConfig.appDirectory, file);
-  let relativePath = path5.relative(reactRouterConfig.appDirectory, fullPath);
+  let fullPath = path6.resolve(reactRouterConfig.appDirectory, file);
+  let relativePath = path6.relative(reactRouterConfig.appDirectory, fullPath);
   return vite2.normalizePath(relativePath).split("?")[0];
 };
-var resolveRelativeRouteFilePath = (route, reactRouterConfig) => {
-  let vite2 = getVite();
-  let file = route.file;
-  let fullPath = path5.resolve(reactRouterConfig.appDirectory, file);
-  return vite2.normalizePath(fullPath);
-};
 var virtual = {
   serverBuild: create("server-build"),
   serverManifest: create("server-manifest"),
@@ -2451,7 +2540,7 @@ var getHash = (source, maxLength) => {
 var resolveChunk = (ctx, viteManifest, absoluteFilePath) => {
   let vite2 = getVite();
   let rootRelativeFilePath = vite2.normalizePath(
-    path5.relative(ctx.rootDirectory, absoluteFilePath)
+    path6.relative(ctx.rootDirectory, absoluteFilePath)
   );
   let entryChunk = viteManifest[rootRelativeFilePath];
   if (!entryChunk) {
@@ -2540,7 +2629,7 @@ function dedupe(array2) {
   return [...new Set(array2)];
 }
 var writeFileSafe = async (file, contents) => {
-  await (0, import_promises2.mkdir)(path5.dirname(file), { recursive: true });
+  await (0, import_promises2.mkdir)(path6.dirname(file), { recursive: true });
   await (0, import_promises2.writeFile)(file, contents);
 };
 var getExportNames = (code) => {
@@ -2566,7 +2655,7 @@ var compileRouteFile = async (viteChildCompiler, ctx, routeFile, readRouteFile)
   }
   let ssr = true;
   let { pluginContainer, moduleGraph } = viteChildCompiler;
-  let routePath = path5.resolve(ctx.reactRouterConfig.appDirectory, routeFile);
+  let routePath = path6.resolve(ctx.reactRouterConfig.appDirectory, routeFile);
   let url2 = resolveFileUrl(ctx, routePath);
   let resolveId = async () => {
     let result = await pluginContainer.resolveId(url2, void 0, { ssr });
@@ -2608,12 +2697,12 @@ var resolveEnvironmentBuildContext = ({
   };
   return resolvedBuildContext;
 };
-var getServerBuildDirectory = (reactRouterConfig, { serverBundleId } = {}) => path5.join(
+var getServerBuildDirectory = (reactRouterConfig, { serverBundleId } = {}) => path6.join(
   reactRouterConfig.buildDirectory,
   "server",
   ...serverBundleId ? [serverBundleId] : []
 );
-var getClientBuildDirectory = (reactRouterConfig) => path5.join(reactRouterConfig.buildDirectory, "client");
+var getClientBuildDirectory = (reactRouterConfig) => path6.join(reactRouterConfig.buildDirectory, "client");
 var getServerBundleRouteIds = (vitePluginContext, ctx) => {
   if (!ctx.buildManifest) {
     return void 0;
@@ -2631,14 +2720,14 @@ var getServerBundleRouteIds = (vitePluginContext, ctx) => {
   );
   return Object.keys(serverBundleRoutes);
 };
-var defaultEntriesDir = path5.resolve(
-  path5.dirname(require.resolve("@react-router/dev/package.json")),
+var defaultEntriesDir = path6.resolve(
+  path6.dirname(require.resolve("@react-router/dev/package.json")),
   "dist",
   "config",
   "defaults"
 );
 var defaultEntries = (0, import_node_fs2.readdirSync)(defaultEntriesDir).map(
-  (filename2) => path5.join(defaultEntriesDir, filename2)
+  (filename2) => path6.join(defaultEntriesDir, filename2)
 );
 invariant(defaultEntries.length > 0, "No default entries found");
 var reactRouterDevLoadContext = () => void 0;
@@ -2676,7 +2765,7 @@ var reactRouterVitePlugin = () => {
     let publicPath = viteUserConfig.base ?? "/";
     if (reactRouterConfig.basename !== "/" && viteCommand === "serve" && !viteUserConfig.server?.middlewareMode && !reactRouterConfig.basename.startsWith(publicPath)) {
       logger.error(
-        import_picocolors3.default.red(
+        import_picocolors4.default.red(
           "When using the React Router `basename` and the Vite `base` config, the `basename` config must begin with `base` for the default Vite dev server."
         )
       );
@@ -2734,7 +2823,7 @@ var reactRouterVitePlugin = () => {
       virtual.serverManifest.id
     )};
       export const assetsBuildDirectory = ${JSON.stringify(
-      path5.relative(
+      path6.relative(
         ctx.rootDirectory,
         getClientBuildDirectory(ctx.reactRouterConfig)
       )
@@ -2773,18 +2862,11 @@ var reactRouterVitePlugin = () => {
   };
   let loadViteManifest = async (directory) => {
     let manifestContents = await (0, import_promises2.readFile)(
-      path5.resolve(directory, ".vite", "manifest.json"),
+      path6.resolve(directory, ".vite", "manifest.json"),
       "utf-8"
     );
     return JSON.parse(manifestContents);
   };
-  let hasDependency = (name) => {
-    try {
-      return Boolean(require.resolve(name, { paths: [ctx.rootDirectory] }));
-    } catch (err2) {
-      return false;
-    }
-  };
   let getViteManifestAssetPaths = (viteManifest) => {
     let cssUrlPaths = Object.values(viteManifest).filter((chunk) => chunk.file.endsWith(".css")).map((chunk) => chunk.file);
     let chunkAssetPaths = Object.values(viteManifest).flatMap(
@@ -2805,7 +2887,7 @@ var reactRouterVitePlugin = () => {
         let contents;
         try {
           contents = await (0, import_promises2.readFile)(
-            path5.join(entryNormalizedPath, entry.name),
+            path6.join(entryNormalizedPath, entry.name),
             "utf-8"
           );
         } catch (e) {
@@ -2814,9 +2896,9 @@ var reactRouterVitePlugin = () => {
         }
         let hash = (0, import_node_crypto.createHash)("sha384").update(contents).digest().toString("base64");
         let filepath = getVite().normalizePath(
-          path5.relative(
+          path6.relative(
             clientBuildDirectory,
-            path5.join(entryNormalizedPath, entry.name)
+            path6.join(entryNormalizedPath, entry.name)
           )
         );
         sriManifest[`${ctx2.publicPath}${filepath}`] = `sha384-${hash}`;
@@ -2847,13 +2929,11 @@ var reactRouterVitePlugin = () => {
     );
     let enforceSplitRouteModules = ctx.reactRouterConfig.future.unstable_splitRouteModules === "enforce";
     for (let route of Object.values(ctx.reactRouterConfig.routes)) {
-      let routeFile = path5.join(ctx.reactRouterConfig.appDirectory, route.file);
+      let routeFile = path6.join(ctx.reactRouterConfig.appDirectory, route.file);
       let sourceExports = routeManifestExports[route.id];
       let hasClientAction = sourceExports.includes("clientAction");
       let hasClientLoader = sourceExports.includes("clientLoader");
-      let hasClientMiddleware = sourceExports.includes(
-        "unstable_clientMiddleware"
-      );
+      let hasClientMiddleware = sourceExports.includes("clientMiddleware");
       let hasHydrateFallback = sourceExports.includes("HydrateFallback");
       let { hasRouteChunkByExportName } = await detectRouteChunksIfEnabled(
         cache,
@@ -2868,7 +2948,7 @@ var reactRouterVitePlugin = () => {
           valid: {
             clientAction: !hasClientAction || hasRouteChunkByExportName.clientAction,
             clientLoader: !hasClientLoader || hasRouteChunkByExportName.clientLoader,
-            unstable_clientMiddleware: !hasClientMiddleware || hasRouteChunkByExportName.unstable_clientMiddleware,
+            clientMiddleware: !hasClientMiddleware || hasRouteChunkByExportName.clientMiddleware,
             HydrateFallback: !hasHydrateFallback || hasRouteChunkByExportName.HydrateFallback
           }
         });
@@ -2902,10 +2982,10 @@ var reactRouterVitePlugin = () => {
           viteManifest,
           getRouteChunkModuleId(routeFile, "clientLoader")
         ) : void 0,
-        clientMiddlewareModule: hasRouteChunkByExportName.unstable_clientMiddleware ? getPublicModulePathForEntry(
+        clientMiddlewareModule: hasRouteChunkByExportName.clientMiddleware ? getPublicModulePathForEntry(
           ctx,
           viteManifest,
-          getRouteChunkModuleId(routeFile, "unstable_clientMiddleware")
+          getRouteChunkModuleId(routeFile, "clientMiddleware")
         ) : void 0,
         hydrateFallbackModule: hasRouteChunkByExportName.HydrateFallback ? getPublicModulePathForEntry(
           ctx,
@@ -2920,7 +3000,7 @@ var reactRouterVitePlugin = () => {
     }
     let fingerprintedValues = { entry, routes: browserRoutes };
     let version = getHash(JSON.stringify(fingerprintedValues), 8);
-    let manifestPath = path5.posix.join(
+    let manifestPath = path6.posix.join(
       viteConfig2.build.assetsDir,
       `manifest-${version}.js`
     );
@@ -2932,7 +3012,7 @@ var reactRouterVitePlugin = () => {
       sri: void 0
     };
     await writeFileSafe(
-      path5.join(getClientBuildDirectory(ctx.reactRouterConfig), manifestPath),
+      path6.join(getClientBuildDirectory(ctx.reactRouterConfig), manifestPath),
       `window.__reactRouterManifest=${JSON.stringify(
         reactRouterBrowserManifest
       )};`
@@ -2964,9 +3044,7 @@ var reactRouterVitePlugin = () => {
       let sourceExports = routeManifestExports[key];
       let hasClientAction = sourceExports.includes("clientAction");
       let hasClientLoader = sourceExports.includes("clientLoader");
-      let hasClientMiddleware = sourceExports.includes(
-        "unstable_clientMiddleware"
-      );
+      let hasClientMiddleware = sourceExports.includes("clientMiddleware");
       let hasHydrateFallback = sourceExports.includes("HydrateFallback");
       let routeModulePath = combineURLs(
         ctx.publicPath,
@@ -2988,7 +3066,7 @@ var reactRouterVitePlugin = () => {
           valid: {
             clientAction: !hasClientAction || hasRouteChunkByExportName.clientAction,
             clientLoader: !hasClientLoader || hasRouteChunkByExportName.clientLoader,
-            unstable_clientMiddleware: !hasClientMiddleware || hasRouteChunkByExportName.unstable_clientMiddleware,
+            clientMiddleware: !hasClientMiddleware || hasRouteChunkByExportName.clientMiddleware,
             HydrateFallback: !hasHydrateFallback || hasRouteChunkByExportName.HydrateFallback
           }
         });
@@ -3060,7 +3138,6 @@ var reactRouterVitePlugin = () => {
       config: async (_viteUserConfig, _viteConfigEnv) => {
         await preloadVite();
         let vite2 = getVite();
-        let viteMajorVersion = parseInt(vite2.version.split(".")[0], 10);
         viteUserConfig = _viteUserConfig;
         viteConfigEnv = _viteConfigEnv;
         viteCommand = viteConfigEnv.command;
@@ -3114,18 +3191,10 @@ var reactRouterVitePlugin = () => {
             resolve: serverEnvironment.resolve
           },
           optimizeDeps: {
-            entries: ctx.reactRouterConfig.future.unstable_optimizeDeps ? [
-              vite2.normalizePath(ctx.entryClientFilePath),
-              ...Object.values(ctx.reactRouterConfig.routes).map(
-                (route) => resolveRelativeRouteFilePath(route, ctx.reactRouterConfig)
-              )
-            ].map(
-              (entry) => (
-                // In Vite 7, the `optimizeDeps.entries` option only accepts glob patterns.
-                // In prior versions, absolute file paths were treated differently.
-                viteMajorVersion >= 7 ? (0, import_tinyglobby.escapePath)(entry) : entry
-              )
-            ) : [],
+            entries: getOptimizeDepsEntries({
+              entryClientFilePath: ctx.entryClientFilePath,
+              reactRouterConfig: ctx.reactRouterConfig
+            }),
             include: [
               // Pre-bundle React dependencies to avoid React duplicates,
               // even if React dependencies are not direct dependencies.
@@ -3140,7 +3209,10 @@ var reactRouterVitePlugin = () => {
               "react-router",
               "react-router/dom",
               // Check to avoid "Failed to resolve dependency: react-router-dom, present in 'optimizeDeps.include'"
-              ...hasDependency("react-router-dom") ? ["react-router-dom"] : []
+              ...hasDependency({
+                name: "react-router-dom",
+                rootDirectory: ctx.rootDirectory
+              }) ? ["react-router-dom"] : []
             ]
           },
           esbuild: {
@@ -3292,23 +3364,6 @@ var reactRouterVitePlugin = () => {
           cssModulesManifest[id] = code;
         }
       },
-      buildStart() {
-        invariant(viteConfig);
-        if (viteCommand === "build" && viteConfig.mode === "production" && !viteConfig.build.ssr && viteConfig.build.sourcemap) {
-          viteConfig.logger.warn(
-            import_picocolors3.default.yellow(
-              "\n" + import_picocolors3.default.bold("  \u26A0\uFE0F  Source maps are enabled in production\n") + [
-                "This makes your server code publicly",
-                "visible in the browser. This is highly",
-                "discouraged! If you insist, ensure that",
-                "you are using environment variables for",
-                "secrets and not hard-coding them in",
-                "your source code."
-              ].map((line) => "     " + line).join("\n") + "\n"
-            )
-          );
-        }
-      },
       async configureServer(viteDevServer) {
         (0, import_react_router2.unstable_setDevServerHooks)({
           // Give the request handler access to the critical CSS in dev to avoid a
@@ -3348,7 +3403,7 @@ var reactRouterVitePlugin = () => {
               return;
             }
             let message = configChanged ? "Config changed." : routeConfigChanged ? "Route config changed." : configCodeChanged ? "Config saved." : routeConfigCodeChanged ? " Route config saved." : "Config saved";
-            logger.info(import_picocolors3.default.green(message), {
+            logger.info(import_picocolors4.default.green(message), {
               clear: true,
               timestamp: true
             });
@@ -3438,11 +3493,11 @@ var reactRouterVitePlugin = () => {
           let removedAssetPaths = [];
           let copiedAssetPaths = [];
           for (let ssrAssetPath of ssrAssetPaths) {
-            let src = path5.join(serverBuildDirectory, ssrAssetPath);
-            let dest = path5.join(clientBuildDirectory, ssrAssetPath);
+            let src = path6.join(serverBuildDirectory, ssrAssetPath);
+            let dest = path6.join(clientBuildDirectory, ssrAssetPath);
             if (!userSsrEmitAssets) {
               if (!(0, import_node_fs2.existsSync)(dest)) {
-                await (0, import_promises2.mkdir)(path5.dirname(dest), { recursive: true });
+                await (0, import_promises2.mkdir)(path6.dirname(dest), { recursive: true });
                 await (0, import_promises2.rename)(src, dest);
                 movedAssetPaths.push(dest);
               } else {
@@ -3460,7 +3515,7 @@ var reactRouterVitePlugin = () => {
             );
             await Promise.all(
               ssrCssPaths.map(async (cssPath) => {
-                let src = path5.join(serverBuildDirectory, cssPath);
+                let src = path6.join(serverBuildDirectory, cssPath);
                 await (0, import_promises2.rm)(src, { force: true, recursive: true });
                 removedAssetPaths.push(src);
               })
@@ -3468,7 +3523,7 @@ var reactRouterVitePlugin = () => {
           }
           let cleanedAssetPaths = [...removedAssetPaths, ...movedAssetPaths];
           let handledAssetPaths = [...cleanedAssetPaths, ...copiedAssetPaths];
-          let cleanedAssetDirs = new Set(cleanedAssetPaths.map(path5.dirname));
+          let cleanedAssetDirs = new Set(cleanedAssetPaths.map(path6.dirname));
           await Promise.all(
             Array.from(cleanedAssetDirs).map(async (dir) => {
               try {
@@ -3488,9 +3543,9 @@ var reactRouterVitePlugin = () => {
             if (paths.length) {
               viteConfig.logger.info(
                 [
-                  `${import_picocolors3.default.green("\u2713")} ${message}`,
+                  `${import_picocolors4.default.green("\u2713")} ${message}`,
                   ...paths.map(
-                    (assetPath) => import_picocolors3.default.dim(path5.relative(ctx.rootDirectory, assetPath))
+                    (assetPath) => import_picocolors4.default.dim(path6.relative(ctx.rootDirectory, assetPath))
                   )
                 ].join("\n")
               );
@@ -3534,7 +3589,7 @@ var reactRouterVitePlugin = () => {
             viteConfig.logger.info(
               [
                 "Removing the server build in",
-                import_picocolors3.default.green(serverBuildDirectory),
+                import_picocolors4.default.green(serverBuildDirectory),
                 "due to ssr:false"
               ].join(" ")
             );
@@ -3584,7 +3639,7 @@ var reactRouterVitePlugin = () => {
         );
         let isMainChunkExport = (name) => !chunkedExports.includes(name);
         let mainChunkReexports = sourceExports.filter(isMainChunkExport).join(", ");
-        let chunkBasePath = `./${path5.basename(id)}`;
+        let chunkBasePath = `./${path6.basename(id)}`;
         return [
           `export { ${mainChunkReexports} } from "${getRouteChunkModuleId(
             chunkBasePath,
@@ -3604,7 +3659,7 @@ var reactRouterVitePlugin = () => {
       async transform(code, id, options) {
         if (!id.endsWith(BUILD_CLIENT_ROUTE_QUERY_STRING)) return;
         let routeModuleId = id.replace(BUILD_CLIENT_ROUTE_QUERY_STRING, "");
-        let routeFileName = path5.basename(routeModuleId);
+        let routeFileName = path6.basename(routeModuleId);
         let sourceExports = await getRouteModuleExports(
           viteChildCompiler,
           ctx,
@@ -3656,9 +3711,7 @@ var reactRouterVitePlugin = () => {
             valid: {
               clientAction: !exportNames.includes("clientAction"),
               clientLoader: !exportNames.includes("clientLoader"),
-              unstable_clientMiddleware: !exportNames.includes(
-                "unstable_clientMiddleware"
-              ),
+              clientMiddleware: !exportNames.includes("clientMiddleware"),
               HydrateFallback: !exportNames.includes("HydrateFallback")
             }
           });
@@ -3733,7 +3786,7 @@ var reactRouterVitePlugin = () => {
         }
         let vite2 = getVite();
         let importerShort = vite2.normalizePath(
-          path5.relative(ctx.rootDirectory, importer)
+          path6.relative(ctx.rootDirectory, importer)
         );
         if (isRoute(ctx.reactRouterConfig, importer)) {
           let serverOnlyExports = SERVER_ONLY_ROUTE_EXPORTS.map(
@@ -3741,7 +3794,7 @@ var reactRouterVitePlugin = () => {
           ).join(", ");
           throw Error(
             [
-              import_picocolors3.default.red(`Server-only module referenced by client`),
+              import_picocolors4.default.red(`Server-only module referenced by client`),
               "",
               `    '${id}' imported by route '${importerShort}'`,
               "",
@@ -3757,7 +3810,7 @@ var reactRouterVitePlugin = () => {
         }
         throw Error(
           [
-            import_picocolors3.default.red(`Server-only module referenced by client`),
+            import_picocolors4.default.red(`Server-only module referenced by client`),
             "",
             `    '${id}' imported by '${importerShort}'`,
             "",
@@ -3855,10 +3908,10 @@ var reactRouterVitePlugin = () => {
       },
       async load(id) {
         if (id !== virtualHmrRuntime.resolvedId) return;
-        let reactRefreshDir = path5.dirname(
+        let reactRefreshDir = path6.dirname(
           require.resolve("react-refresh/package.json")
         );
-        let reactRefreshRuntimePath = path5.join(
+        let reactRefreshRuntimePath = path6.join(
           reactRefreshDir,
           "cjs/react-refresh-runtime.development.js"
         );
@@ -3967,7 +4020,8 @@ var reactRouterVitePlugin = () => {
         }
       }
     },
-    validatePluginOrder()
+    validatePluginOrder(),
+    warnOnClientSourceMaps()
   ];
 };
 function getParentClientNodes(clientModuleGraph, module2) {
@@ -4037,7 +4091,7 @@ if (import.meta.hot && !inWebWorker) {
 function getRoute(pluginConfig, file) {
   let vite2 = getVite();
   let routePath = vite2.normalizePath(
-    path5.relative(pluginConfig.appDirectory, file)
+    path6.relative(pluginConfig.appDirectory, file)
   );
   let route = Object.values(pluginConfig.routes).find(
     (r) => vite2.normalizePath(r.file) === routePath
@@ -4076,7 +4130,7 @@ async function getRouteMetadata(cache, ctx, viteChildCompiler, route, readRouteF
     caseSensitive: route.caseSensitive,
     url: combineURLs(
       ctx.publicPath,
-      "/" + path5.relative(
+      "/" + path6.relative(
         ctx.rootDirectory,
         resolveRelativeRouteFilePath(route, ctx.reactRouterConfig)
       )
@@ -4085,13 +4139,13 @@ async function getRouteMetadata(cache, ctx, viteChildCompiler, route, readRouteF
     // Ensure the Vite dev server responds with a JS module
     clientActionModule: hasRouteChunkByExportName.clientAction ? `${getRouteChunkModuleId(moduleUrl, "clientAction")}` : void 0,
     clientLoaderModule: hasRouteChunkByExportName.clientLoader ? `${getRouteChunkModuleId(moduleUrl, "clientLoader")}` : void 0,
-    clientMiddlewareModule: hasRouteChunkByExportName.unstable_clientMiddleware ? `${getRouteChunkModuleId(moduleUrl, "unstable_clientMiddleware")}` : void 0,
+    clientMiddlewareModule: hasRouteChunkByExportName.clientMiddleware ? `${getRouteChunkModuleId(moduleUrl, "clientMiddleware")}` : void 0,
     hydrateFallbackModule: hasRouteChunkByExportName.HydrateFallback ? `${getRouteChunkModuleId(moduleUrl, "HydrateFallback")}` : void 0,
     hasAction: sourceExports.includes("action"),
     hasClientAction: sourceExports.includes("clientAction"),
     hasLoader: sourceExports.includes("loader"),
     hasClientLoader: sourceExports.includes("clientLoader"),
-    hasClientMiddleware: sourceExports.includes("unstable_clientMiddleware"),
+    hasClientMiddleware: sourceExports.includes("clientMiddleware"),
     hasErrorBoundary: sourceExports.includes("ErrorBoundary"),
     imports: []
   };
@@ -4104,7 +4158,7 @@ function isSpaModeEnabled(reactRouterConfig) {
   return reactRouterConfig.ssr === false && !isPrerenderingEnabled(reactRouterConfig);
 }
 async function getPrerenderBuildAndHandler(viteConfig, serverBuildDirectory, serverBuildFile) {
-  let serverBuildPath = path5.join(serverBuildDirectory, serverBuildFile);
+  let serverBuildPath = path6.join(serverBuildDirectory, serverBuildFile);
   let build = await import(url.pathToFileURL(serverBuildPath).toString());
   let { createRequestHandler: createHandler } = await import("react-router");
   return {
@@ -4146,15 +4200,15 @@ async function handleSpaMode(viteConfig, reactRouterConfig, serverBuildDirectory
       "SPA Mode: Did you forget to include `<Scripts/>` in your root route? Your pre-rendered HTML cannot hydrate without `<Scripts />`."
     );
   }
-  await (0, import_promises2.writeFile)(path5.join(clientBuildDirectory, filename2), html);
-  let prettyDir = path5.relative(viteConfig.root, clientBuildDirectory);
-  let prettyPath = path5.join(prettyDir, filename2);
+  await (0, import_promises2.writeFile)(path6.join(clientBuildDirectory, filename2), html);
+  let prettyDir = path6.relative(viteConfig.root, clientBuildDirectory);
+  let prettyPath = path6.join(prettyDir, filename2);
   if (build.prerender.length > 0) {
     viteConfig.logger.info(
-      `Prerender (html): SPA Fallback -> ${import_picocolors3.default.bold(prettyPath)}`
+      `Prerender (html): SPA Fallback -> ${import_picocolors4.default.bold(prettyPath)}`
     );
   } else {
-    viteConfig.logger.info(`SPA Mode: Generated ${import_picocolors3.default.bold(prettyPath)}`);
+    viteConfig.logger.info(`SPA Mode: Generated ${import_picocolors4.default.bold(prettyPath)}`);
   }
 }
 async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirectory, serverBuildPath, clientBuildDirectory) {
@@ -4164,17 +4218,17 @@ async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirecto
     serverBuildPath
   );
   let routes = createPrerenderRoutes(reactRouterConfig.routes);
-  for (let path6 of build.prerender) {
-    let matches = (0, import_react_router2.matchRoutes)(routes, `/${path6}/`.replace(/^\/\/+/, "/"));
+  for (let path7 of build.prerender) {
+    let matches = (0, import_react_router2.matchRoutes)(routes, `/${path7}/`.replace(/^\/\/+/, "/"));
     if (!matches) {
       throw new Error(
-        `Unable to prerender path because it does not match any routes: ${path6}`
+        `Unable to prerender path because it does not match any routes: ${path7}`
       );
     }
   }
   let buildRoutes = createPrerenderRoutes(build.routes);
-  for (let path6 of build.prerender) {
-    let matches = (0, import_react_router2.matchRoutes)(buildRoutes, `/${path6}/`.replace(/^\/\/+/, "/"));
+  for (let path7 of build.prerender) {
+    let matches = (0, import_react_router2.matchRoutes)(buildRoutes, `/${path7}/`.replace(/^\/\/+/, "/"));
     if (!matches) {
       continue;
     }
@@ -4187,7 +4241,7 @@ async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirecto
       if (manifestRoute.loader) {
         await prerenderData(
           handler,
-          path6,
+          path7,
           [leafRoute.id],
           clientBuildDirectory,
           reactRouterConfig,
@@ -4195,7 +4249,7 @@ async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirecto
         );
         await prerenderResourceRoute(
           handler,
-          path6,
+          path7,
           clientBuildDirectory,
           reactRouterConfig,
           viteConfig
@@ -4213,7 +4267,7 @@ async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirecto
       if (!isResourceRoute && hasLoaders) {
         data = await prerenderData(
           handler,
-          path6,
+          path7,
           null,
           clientBuildDirectory,
           reactRouterConfig,
@@ -4222,7 +4276,7 @@ async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirecto
       }
       await prerenderRoute(
         handler,
-        path6,
+        path7,
         clientBuildDirectory,
         reactRouterConfig,
         viteConfig,
@@ -4275,12 +4329,12 @@ async function prerenderData(handler, prerenderPath, onlyRoutes, clientBuildDire
 ${normalizedPath}`
     );
   }
-  let outfile = path5.join(clientBuildDirectory, ...normalizedPath.split("/"));
-  await (0, import_promises2.mkdir)(path5.dirname(outfile), { recursive: true });
+  let outfile = path6.join(clientBuildDirectory, ...normalizedPath.split("/"));
+  await (0, import_promises2.mkdir)(path6.dirname(outfile), { recursive: true });
   await (0, import_promises2.writeFile)(outfile, data);
   viteConfig.logger.info(
-    `Prerender (data): ${prerenderPath} -> ${import_picocolors3.default.bold(
-      path5.relative(viteConfig.root, outfile)
+    `Prerender (data): ${prerenderPath} -> ${import_picocolors4.default.bold(
+      path6.relative(viteConfig.root, outfile)
     )}`
   );
   return data;
@@ -4315,16 +4369,16 @@ async function prerenderRoute(handler, prerenderPath, clientBuildDirectory, reac
 ${html}`
     );
   }
-  let outfile = path5.join(
+  let outfile = path6.join(
     clientBuildDirectory,
     ...normalizedPath.split("/"),
     "index.html"
   );
-  await (0, import_promises2.mkdir)(path5.dirname(outfile), { recursive: true });
+  await (0, import_promises2.mkdir)(path6.dirname(outfile), { recursive: true });
   await (0, import_promises2.writeFile)(outfile, html);
   viteConfig.logger.info(
-    `Prerender (html): ${prerenderPath} -> ${import_picocolors3.default.bold(
-      path5.relative(viteConfig.root, outfile)
+    `Prerender (html): ${prerenderPath} -> ${import_picocolors4.default.bold(
+      path6.relative(viteConfig.root, outfile)
     )}`
   );
 }
@@ -4339,12 +4393,12 @@ async function prerenderResourceRoute(handler, prerenderPath, clientBuildDirecto
 ${content.toString("utf8")}`
     );
   }
-  let outfile = path5.join(clientBuildDirectory, ...normalizedPath.split("/"));
-  await (0, import_promises2.mkdir)(path5.dirname(outfile), { recursive: true });
+  let outfile = path6.join(clientBuildDirectory, ...normalizedPath.split("/"));
+  await (0, import_promises2.mkdir)(path6.dirname(outfile), { recursive: true });
   await (0, import_promises2.writeFile)(outfile, content);
   viteConfig.logger.info(
-    `Prerender (resource): ${prerenderPath} -> ${import_picocolors3.default.bold(
-      path5.relative(viteConfig.root, outfile)
+    `Prerender (resource): ${prerenderPath} -> ${import_picocolors4.default.bold(
+      path6.relative(viteConfig.root, outfile)
     )}`
   );
 }
@@ -4356,7 +4410,7 @@ async function getPrerenderPaths(prerender, ssr, routes, logWarning = false) {
       let { paths, paramRoutes } = getStaticPrerenderPaths(prerenderRoutes);
       if (logWarning && !ssr && paramRoutes.length > 0) {
         console.warn(
-          import_picocolors3.default.yellow(
+          import_picocolors4.default.yellow(
             [
               "\u26A0\uFE0F Paths with dynamic/splat params cannot be prerendered when using `prerender: true`. You may want to use the `prerender()` API to prerender the following paths:",
               ...paramRoutes.map((p) => "  - " + p)
@@ -4418,14 +4472,14 @@ async function validateSsrFalsePrerenderExports(viteConfig, ctx, manifest, viteC
   }
   let prerenderRoutes = createPrerenderRoutes(manifest.routes);
   let prerenderedRoutes = /* @__PURE__ */ new Set();
-  for (let path6 of prerenderPaths) {
+  for (let path7 of prerenderPaths) {
     let matches = (0, import_react_router2.matchRoutes)(
       prerenderRoutes,
-      `/${path6}/`.replace(/^\/\/+/, "/")
+      `/${path7}/`.replace(/^\/\/+/, "/")
     );
     invariant(
       matches,
-      `Unable to prerender path because it does not match any routes: ${path6}`
+      `Unable to prerender path because it does not match any routes: ${path7}`
     );
     matches.forEach((m) => prerenderedRoutes.add(m.route.id));
   }
@@ -4463,7 +4517,7 @@ async function validateSsrFalsePrerenderExports(viteConfig, ctx, manifest, viteC
     }
   }
   if (errors.length > 0) {
-    viteConfig.logger.error(import_picocolors3.default.red(errors.join("\n")));
+    viteConfig.logger.error(import_picocolors4.default.red(errors.join("\n")));
     throw new Error(
       "Invalid route exports found when prerendering with `ssr:false`"
     );
@@ -4539,7 +4593,7 @@ async function detectRouteChunksIfEnabled(cache, ctx, id, input) {
       hasRouteChunkByExportName: {
         clientAction: false,
         clientLoader: false,
-        unstable_clientMiddleware: false,
+        clientMiddleware: false,
         HydrateFallback: false
       }
     };
@@ -4592,8 +4646,8 @@ function validateRouteChunks({
 async function cleanBuildDirectory(viteConfig, ctx) {
   let buildDirectory = ctx.reactRouterConfig.buildDirectory;
   let isWithinRoot = () => {
-    let relativePath = path5.relative(ctx.rootDirectory, buildDirectory);
-    return !relativePath.startsWith("..") && !path5.isAbsolute(relativePath);
+    let relativePath = path6.relative(ctx.rootDirectory, buildDirectory);
+    return !relativePath.startsWith("..") && !path6.isAbsolute(relativePath);
   };
   if (viteConfig.build.emptyOutDir ?? isWithinRoot()) {
     await (0, import_promises2.rm)(buildDirectory, { force: true, recursive: true });
@@ -4604,7 +4658,7 @@ async function cleanViteManifests(environmentsOptions, ctx) {
     ([environmentName, options]) => {
       let outDir = options.build?.outDir;
       invariant(outDir, `Expected build.outDir for ${environmentName}`);
-      return path5.join(outDir, ".vite/manifest.json");
+      return path6.join(outDir, ".vite/manifest.json");
     }
   );
   await Promise.all(
@@ -4614,7 +4668,7 @@ async function cleanViteManifests(environmentsOptions, ctx) {
       if (!ctx.viteManifestEnabled) {
         await (0, import_promises2.rm)(viteManifestPath, { force: true, recursive: true });
       }
-      let viteDir = path5.dirname(viteManifestPath);
+      let viteDir = path6.dirname(viteManifestPath);
       let viteDirFiles = await (0, import_promises2.readdir)(viteDir, { recursive: true });
       if (viteDirFiles.length === 0) {
         await (0, import_promises2.rm)(viteDir, { force: true, recursive: true });
@@ -4632,12 +4686,12 @@ async function getBuildManifest({
   }
   let { normalizePath } = await import("vite");
   let serverBuildDirectory = getServerBuildDirectory(reactRouterConfig);
-  let resolvedAppDirectory = path5.resolve(rootDirectory, appDirectory);
+  let resolvedAppDirectory = path6.resolve(rootDirectory, appDirectory);
   let rootRelativeRoutes = Object.fromEntries(
     Object.entries(routes).map(([id, route]) => {
-      let filePath = path5.join(resolvedAppDirectory, route.file);
+      let filePath = path6.join(resolvedAppDirectory, route.file);
       let rootRelativeFilePath = normalizePath(
-        path5.relative(rootDirectory, filePath)
+        path6.relative(rootDirectory, filePath)
       );
       return [id, { ...route, file: rootRelativeFilePath }];
     })
@@ -4655,7 +4709,7 @@ async function getBuildManifest({
           (route2) => configRouteToBranchRoute({
             ...route2,
             // Ensure absolute paths are passed to the serverBundles function
-            file: path5.join(resolvedAppDirectory, route2.file)
+            file: path6.join(resolvedAppDirectory, route2.file)
           })
         )
       });
@@ -4679,10 +4733,10 @@ async function getBuildManifest({
       buildManifest.serverBundles[serverBundleId] ??= {
         id: serverBundleId,
         file: normalizePath(
-          path5.join(
-            path5.relative(
+          path6.join(
+            path6.relative(
               rootDirectory,
-              path5.join(serverBuildDirectory, serverBundleId)
+              path6.join(serverBuildDirectory, serverBundleId)
             ),
             reactRouterConfig.serverBuildFile
           )
@@ -4701,10 +4755,10 @@ function mergeEnvironmentOptions(base, ...overrides) {
 }
 async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
   let { serverBuildFile, serverModuleFormat } = ctx.reactRouterConfig;
-  let packageRoot = path5.dirname(
+  let packageRoot = path6.dirname(
     require.resolve("@react-router/dev/package.json")
   );
-  let { moduleSyncEnabled } = await import(`file:///${path5.join(packageRoot, "module-sync-enabled/index.mjs")}`);
+  let { moduleSyncEnabled } = await import(`file:///${path6.join(packageRoot, "module-sync-enabled/index.mjs")}`);
   let vite2 = getVite();
   function getBaseOptions({
     viteUserConfig
@@ -4783,7 +4837,7 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
             ctx.entryClientFilePath,
             ...Object.values(ctx.reactRouterConfig.routes).flatMap(
               (route) => {
-                let routeFilePath = path5.resolve(
+                let routeFilePath = path6.resolve(
                   ctx.reactRouterConfig.appDirectory,
                   route.file
                 );
@@ -4807,7 +4861,7 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
               ) : null;
               let routeChunkSuffix = routeChunkName ? `-${(0, import_kebabCase.default)(routeChunkName)}` : "";
               let assetsDir = (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig?.environments?.client?.build?.assetsDir : null) ?? viteUserConfig?.build?.assetsDir ?? "assets";
-              return path5.posix.join(
+              return path6.posix.join(
                 assetsDir,
                 `[name]${routeChunkSuffix}-[hash].js`
               );