@react-router/dev 7.1.1 → 7.1.2-pre.0

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.1.1
+ * @react-router/dev v7.1.2-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -46,7 +46,7 @@ module.exports = __toCommonJS(vite_exports);
 
 // vite/plugin.ts
 var import_node_crypto = require("crypto");
-var path4 = __toESM(require("path"));
+var path6 = __toESM(require("path"));
 var url = __toESM(require("url"));
 var fse = __toESM(require("fs-extra"));
 var babel = __toESM(require("@babel/core"));
@@ -70,6 +70,9 @@ var import_server = require("vite-node/server");
 var import_client = require("vite-node/client");
 var import_source_map = require("vite-node/source-map");
 
+// vite/vite.ts
+var import_pathe2 = __toESM(require("pathe"));
+
 // invariant.ts
 function invariant(value, message) {
   if (value === false || value === null || typeof value === "undefined") {
@@ -80,20 +83,41 @@ function invariant(value, message) {
   }
 }
 
-// vite/import-vite-esm-sync.ts
+// config/is-react-router-repo.ts
+var import_pathe = __toESM(require("pathe"));
+function isReactRouterRepo() {
+  let serverRuntimePath = import_pathe.default.dirname(
+    require.resolve("@react-router/node/package.json")
+  );
+  let serverRuntimeParentDir = import_pathe.default.basename(
+    import_pathe.default.resolve(serverRuntimePath, "..")
+  );
+  return serverRuntimeParentDir === "packages";
+}
+
+// vite/vite.ts
 var vite;
-async function preloadViteEsm() {
-  vite = await import("vite");
+var viteImportSpecifier = isReactRouterRepo() ? (
+  // Support testing against different versions of Vite by ensuring that Vite
+  // is resolved from the current working directory when running within this
+  // repo. If we don't do this, Vite will always be imported relative to this
+  // file, which means that it will always resolve to Vite 6.
+  `file:///${import_pathe2.default.normalize(
+    require.resolve("vite/package.json", { paths: [process.cwd()] })
+  ).replace("package.json", "dist/node/index.js")}`
+) : "vite";
+async function preloadVite() {
+  vite = await import(viteImportSpecifier);
 }
-function importViteEsmSync() {
-  invariant(vite, "importViteEsmSync() called before preloadViteEsm()");
+function getVite() {
+  invariant(vite, "getVite() called before preloadVite()");
   return vite;
 }
 
 // vite/vite-node.ts
 async function createContext(viteConfig = {}) {
-  await preloadViteEsm();
-  const vite2 = importViteEsmSync();
+  await preloadVite();
+  const vite2 = getVite();
   const devServer = await vite2.createServer(
     vite2.mergeConfig(
       {
@@ -130,7 +154,7 @@ async function createContext(viteConfig = {}) {
 }
 
 // config/config.ts
-var import_pathe = __toESM(require("pathe"));
+var import_pathe3 = __toESM(require("pathe"));
 var import_chokidar = __toESM(require("chokidar"));
 var import_picocolors = __toESM(require("picocolors"));
 var import_pick2 = __toESM(require("lodash/pick"));
@@ -184,7 +208,7 @@ function validateRouteConfig({
         `Route config in "${routeConfigFile}" is invalid.`,
         root ? `${root}` : [],
         nested ? Object.entries(nested).map(
-          ([path5, message]) => `Path: routes.${path5}
+          ([path7, message]) => `Path: routes.${path7}
 ${message}`
         ) : []
       ].flat().join("\n\n")
@@ -366,13 +390,13 @@ async function resolveConfig({
       "The `prerender` config must be a boolean, an array of string paths, or a function returning a boolean or array of string paths"
     );
   }
-  let appDirectory = import_pathe.default.resolve(root, userAppDirectory || "app");
-  let buildDirectory = import_pathe.default.resolve(root, userBuildDirectory);
+  let appDirectory = import_pathe3.default.resolve(root, userAppDirectory || "app");
+  let buildDirectory = import_pathe3.default.resolve(root, userBuildDirectory);
   let rootRouteFile = findEntry(appDirectory, "root");
   if (!rootRouteFile) {
-    let rootRouteDisplayPath = import_pathe.default.relative(
+    let rootRouteDisplayPath = import_pathe3.default.relative(
       root,
-      import_pathe.default.join(appDirectory, "root.tsx")
+      import_pathe3.default.join(appDirectory, "root.tsx")
     );
     return err(
       `Could not find a root route module in the app directory as "${rootRouteDisplayPath}"`
@@ -384,15 +408,15 @@ async function resolveConfig({
   let routeConfigFile = findEntry(appDirectory, "routes");
   try {
     if (!routeConfigFile) {
-      let routeConfigDisplayPath = import_pathe.default.relative(
+      let routeConfigDisplayPath = import_pathe3.default.relative(
         root,
-        import_pathe.default.join(appDirectory, "routes.ts")
+        import_pathe3.default.join(appDirectory, "routes.ts")
       );
       return err(`Route config file not found at "${routeConfigDisplayPath}".`);
     }
     setAppDirectory(appDirectory);
     let routeConfigExport = (await viteNodeContext.runner.executeFile(
-      import_pathe.default.join(appDirectory, routeConfigFile)
+      import_pathe3.default.join(appDirectory, routeConfigFile)
     )).default;
     let routeConfig = await routeConfigExport;
     let result = validateRouteConfig({
@@ -412,7 +436,7 @@ async function resolveConfig({
         import_picocolors.default.red(`Route config in "${routeConfigFile}" is invalid.`),
         "",
         error.loc?.file && error.loc?.column && error.frame ? [
-          import_pathe.default.relative(appDirectory, error.loc.file) + ":" + error.loc.line + ":" + error.loc.column,
+          import_pathe3.default.relative(appDirectory, error.loc.file) + ":" + error.loc.line + ":" + error.loc.column,
           error.frame.trim?.()
         ] : error.stack
       ].flat().join("\n")
@@ -484,8 +508,8 @@ async function createConfigLoader({
         );
         fsWatcher.on("all", async (...args) => {
           let [event, rawFilepath] = args;
-          let filepath = import_pathe.default.normalize(rawFilepath);
-          let appFileAddedOrRemoved = appDirectory && (event === "add" || event === "unlink") && filepath.startsWith(import_pathe.default.normalize(appDirectory));
+          let filepath = import_pathe3.default.normalize(rawFilepath);
+          let appFileAddedOrRemoved = appDirectory && (event === "add" || event === "unlink") && filepath.startsWith(import_pathe3.default.normalize(appDirectory));
           let configCodeUpdated = Boolean(
             viteNodeContext.devServer?.moduleGraph.getModuleById(filepath)
           );
@@ -531,8 +555,8 @@ async function resolveEntryFiles({
   reactRouterConfig
 }) {
   let { appDirectory } = reactRouterConfig;
-  let defaultsDirectory = import_pathe.default.resolve(
-    import_pathe.default.dirname(require.resolve("@react-router/dev/package.json")),
+  let defaultsDirectory = import_pathe3.default.resolve(
+    import_pathe3.default.dirname(require.resolve("@react-router/dev/package.json")),
     "dist",
     "config",
     "defaults"
@@ -570,11 +594,11 @@ async function resolveEntryFiles({
     }
     entryServerFile = `entry.server.node.tsx`;
   }
-  let entryClientFilePath = userEntryClientFile ? import_pathe.default.resolve(reactRouterConfig.appDirectory, userEntryClientFile) : import_pathe.default.resolve(defaultsDirectory, entryClientFile);
-  let entryServerFilePath = userEntryServerFile ? import_pathe.default.resolve(reactRouterConfig.appDirectory, userEntryServerFile) : import_pathe.default.resolve(defaultsDirectory, entryServerFile);
+  let entryClientFilePath = userEntryClientFile ? import_pathe3.default.resolve(reactRouterConfig.appDirectory, userEntryClientFile) : import_pathe3.default.resolve(defaultsDirectory, entryClientFile);
+  let entryServerFilePath = userEntryServerFile ? import_pathe3.default.resolve(reactRouterConfig.appDirectory, userEntryServerFile) : import_pathe3.default.resolve(defaultsDirectory, entryServerFile);
   return { entryClientFilePath, entryServerFilePath };
 }
-var ssrExternals = isInReactRouterMonorepo() ? [
+var ssrExternals = isReactRouterRepo() ? [
   // This is only needed within this repo because these packages
   // are linked to a directory outside of node_modules so Vite
   // treats them as internal code by default.
@@ -587,21 +611,12 @@ var ssrExternals = isInReactRouterMonorepo() ? [
   "@react-router/node",
   "@react-router/serve"
 ] : void 0;
-function isInReactRouterMonorepo() {
-  let serverRuntimePath = import_pathe.default.dirname(
-    require.resolve("@react-router/node/package.json")
-  );
-  let serverRuntimeParentDir = import_pathe.default.basename(
-    import_pathe.default.resolve(serverRuntimePath, "..")
-  );
-  return serverRuntimeParentDir === "packages";
-}
 var entryExts = [".js", ".jsx", ".ts", ".tsx"];
 function findEntry(dir, basename2, options) {
   for (let ext of entryExts) {
-    let file = import_pathe.default.resolve(dir, basename2 + ext);
+    let file = import_pathe3.default.resolve(dir, basename2 + ext);
     if (import_node_fs.default.existsSync(file)) {
-      return options?.absolute ?? false ? file : import_pathe.default.relative(dir, file);
+      return options?.absolute ?? false ? file : import_pathe3.default.relative(dir, file);
     }
   }
   return void 0;
@@ -688,7 +703,7 @@ function generate(ctx, route) {
     }
   `;
 }
-var noExtension = (path5) => Path3.join(Path3.dirname(path5), Pathe2.filename(path5));
+var noExtension = (path7) => Path3.join(Path3.dirname(path7), Pathe2.filename(path7));
 function getRouteLineage(routes, route) {
   const result = [];
   while (route) {
@@ -850,17 +865,17 @@ async function toNodeRequest(res, nodeRes) {
 }
 
 // vite/styles.ts
-var path3 = __toESM(require("path"));
+var path5 = __toESM(require("path"));
 var import_react_router = require("react-router");
 
 // vite/resolve-file-url.ts
-var path2 = __toESM(require("path"));
+var path4 = __toESM(require("path"));
 var resolveFileUrl = ({ rootDirectory }, filePath) => {
-  let vite2 = importViteEsmSync();
-  let relativePath = path2.relative(rootDirectory, filePath);
-  let isWithinRoot = !relativePath.startsWith("..") && !path2.isAbsolute(relativePath);
+  let vite2 = getVite();
+  let relativePath = path4.relative(rootDirectory, filePath);
+  let isWithinRoot = !relativePath.startsWith("..") && !path4.isAbsolute(relativePath);
   if (!isWithinRoot) {
-    return path2.posix.join("/@fs", vite2.normalizePath(filePath));
+    return path4.posix.join("/@fs", vite2.normalizePath(filePath));
   }
   return "/" + vite2.normalizePath(relativePath);
 };
@@ -894,13 +909,13 @@ var getStylesForFiles = async ({
   cssModulesManifest,
   files
 }) => {
-  let vite2 = importViteEsmSync();
+  let vite2 = getVite();
   let viteMajor = parseInt(vite2.version.split(".")[0], 10);
   let styles = {};
   let deps = /* @__PURE__ */ new Set();
   try {
     for (let file of files) {
-      let normalizedPath = path3.resolve(rootDirectory, file).replace(/\\/g, "/");
+      let normalizedPath = path5.resolve(rootDirectory, file).replace(/\\/g, "/");
       let node = await viteDevServer.moduleGraph.getModuleById(normalizedPath);
       if (!node) {
         try {
@@ -1005,9 +1020,9 @@ var getStylesForUrl = async ({
     return void 0;
   }
   let routes = createRoutes(build.routes);
-  let appPath = path3.relative(process.cwd(), reactRouterConfig.appDirectory);
+  let appPath = path5.relative(process.cwd(), reactRouterConfig.appDirectory);
   let documentRouteFiles = (0, import_react_router.matchRoutes)(routes, url2, build.basename)?.map(
-    (match) => path3.resolve(appPath, reactRouterConfig.routes[match.route.id].file)
+    (match) => path5.resolve(appPath, reactRouterConfig.routes[match.route.id].file)
   ) ?? [];
   let styles = await getStylesForFiles({
     viteDevServer,
@@ -1015,7 +1030,7 @@ var getStylesForUrl = async ({
     cssModulesManifest,
     files: [
       // Always include the client entry file when crawling the module graph for CSS
-      path3.relative(rootDirectory, entryClientFilePath),
+      path5.relative(rootDirectory, entryClientFilePath),
       // Then include any styles from the matched routes
       ...documentRouteFiles
     ]
@@ -1045,10 +1060,10 @@ var removeExports = (ast, exportsToRemove) => {
   let exportsFiltered = false;
   let markedForRemoval = /* @__PURE__ */ new Set();
   traverse(ast, {
-    ExportDeclaration(path5) {
-      if (path5.node.type === "ExportNamedDeclaration") {
-        if (path5.node.specifiers.length) {
-          path5.node.specifiers = path5.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;
@@ -1057,12 +1072,12 @@ var removeExports = (ast, exportsToRemove) => {
             }
             return true;
           });
-          if (path5.node.specifiers.length === 0) {
-            markedForRemoval.add(path5);
+          if (path7.node.specifiers.length === 0) {
+            markedForRemoval.add(path7);
           }
         }
-        if (path5.node.declaration?.type === "VariableDeclaration") {
-          let declaration = path5.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)) {
@@ -1076,30 +1091,30 @@ var removeExports = (ast, exportsToRemove) => {
             }
           );
           if (declaration.declarations.length === 0) {
-            markedForRemoval.add(path5);
+            markedForRemoval.add(path7);
           }
         }
-        if (path5.node.declaration?.type === "FunctionDeclaration") {
-          let id = path5.node.declaration.id;
+        if (path7.node.declaration?.type === "FunctionDeclaration") {
+          let id = path7.node.declaration.id;
           if (id && exportsToRemove.includes(id.name)) {
-            markedForRemoval.add(path5);
+            markedForRemoval.add(path7);
           }
         }
-        if (path5.node.declaration?.type === "ClassDeclaration") {
-          let id = path5.node.declaration.id;
+        if (path7.node.declaration?.type === "ClassDeclaration") {
+          let id = path7.node.declaration.id;
           if (id && exportsToRemove.includes(id.name)) {
-            markedForRemoval.add(path5);
+            markedForRemoval.add(path7);
           }
         }
       }
-      if (path5.node.type === "ExportDefaultDeclaration" && exportsToRemove.includes("default")) {
-        markedForRemoval.add(path5);
+      if (path7.node.type === "ExportDefaultDeclaration" && exportsToRemove.includes("default")) {
+        markedForRemoval.add(path7);
       }
     }
   });
   if (markedForRemoval.size > 0 || exportsFiltered) {
-    for (let path5 of markedForRemoval) {
-      path5.remove();
+    for (let path7 of markedForRemoval) {
+      path7.remove();
     }
     (0, import_babel_dead_code_elimination.deadCodeElimination)(ast, previouslyReferencedIdentifiers);
   }
@@ -1197,24 +1212,24 @@ var plugin = {
 };
 var transform = (ast) => {
   const hocs = [];
-  function getHocUid(path5, hocName) {
-    const uid = path5.scope.generateUidIdentifier(hocName);
+  function getHocUid(path7, hocName) {
+    const uid = path7.scope.generateUidIdentifier(hocName);
     hocs.push([hocName, uid]);
     return uid;
   }
   traverse(ast, {
-    ExportDeclaration(path5) {
-      if (path5.isExportDefaultDeclaration()) {
-        const declaration = path5.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(path5, "withComponentProps");
+          const uid = getHocUid(path7, "withComponentProps");
           declaration.replaceWith(t.callExpression(uid, [expr]));
         }
         return;
       }
-      if (path5.isExportNamedDeclaration()) {
-        const decl = path5.get("declaration");
+      if (path7.isExportNamedDeclaration()) {
+        const decl = path7.get("declaration");
         if (decl.isVariableDeclaration()) {
           decl.get("declarations").forEach((varDeclarator) => {
             const id = varDeclarator.get("id");
@@ -1224,7 +1239,7 @@ var transform = (ast) => {
             if (!id.isIdentifier()) return;
             const { name } = id.node;
             if (!NAMED_COMPONENT_EXPORTS.includes(name)) return;
-            const uid = getHocUid(path5, `with${name}Props`);
+            const uid = getHocUid(path7, `with${name}Props`);
             init.replaceWith(t.callExpression(uid, [expr]));
           });
           return;
@@ -1234,7 +1249,7 @@ var transform = (ast) => {
           if (!id) return;
           const { name } = id;
           if (!NAMED_COMPONENT_EXPORTS.includes(name)) return;
-          const uid = getHocUid(path5, `with${name}Props`);
+          const uid = getHocUid(path7, `with${name}Props`);
           decl.replaceWith(
             t.variableDeclaration("const", [
               t.variableDeclarator(
@@ -1286,9 +1301,9 @@ var BUILD_CLIENT_ROUTE_QUERY_STRING = "?__react-router-build-client-route";
 var virtualHmrRuntime = create("hmr-runtime");
 var virtualInjectHmrRuntime = create("inject-hmr-runtime");
 var resolveRelativeRouteFilePath = (route, reactRouterConfig) => {
-  let vite2 = importViteEsmSync();
+  let vite2 = getVite();
   let file = route.file;
-  let fullPath = path4.resolve(reactRouterConfig.appDirectory, file);
+  let fullPath = path6.resolve(reactRouterConfig.appDirectory, file);
   return vite2.normalizePath(fullPath);
 };
 var virtual = {
@@ -1309,9 +1324,9 @@ var getHash = (source, maxLength) => {
   return typeof maxLength === "number" ? hash.slice(0, maxLength) : hash;
 };
 var resolveChunk = (ctx, viteManifest, absoluteFilePath) => {
-  let vite2 = importViteEsmSync();
+  let vite2 = getVite();
   let rootRelativeFilePath = vite2.normalizePath(
-    path4.relative(ctx.rootDirectory, absoluteFilePath)
+    path6.relative(ctx.rootDirectory, absoluteFilePath)
   );
   let entryChunk = viteManifest[rootRelativeFilePath + BUILD_CLIENT_ROUTE_QUERY_STRING] ?? viteManifest[rootRelativeFilePath];
   if (!entryChunk) {
@@ -1363,7 +1378,7 @@ function dedupe(array2) {
   return [...new Set(array2)];
 }
 var writeFileSafe = async (file, contents) => {
-  await fse.ensureDir(path4.dirname(file));
+  await fse.ensureDir(path6.dirname(file));
   await fse.writeFile(file, contents);
 };
 var getRouteManifestModuleExports = async (viteChildCompiler, ctx) => {
@@ -1385,7 +1400,7 @@ var getRouteModuleExports = async (viteChildCompiler, ctx, routeFile, readRouteF
   }
   let ssr = true;
   let { pluginContainer, moduleGraph } = viteChildCompiler;
-  let routePath = path4.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 });
@@ -1409,19 +1424,19 @@ var getServerBundleBuildConfig = (viteUserConfig) => {
   }
   return viteUserConfig.__reactRouterServerBundleBuildConfig;
 };
-var getServerBuildDirectory = (ctx) => path4.join(
+var getServerBuildDirectory = (ctx) => path6.join(
   ctx.reactRouterConfig.buildDirectory,
   "server",
   ...ctx.serverBundleBuildConfig ? [ctx.serverBundleBuildConfig.serverBundleId] : []
 );
-var getClientBuildDirectory = (reactRouterConfig) => path4.join(reactRouterConfig.buildDirectory, "client");
-var defaultEntriesDir = path4.resolve(
-  path4.dirname(require.resolve("@react-router/dev/package.json")),
+var getClientBuildDirectory = (reactRouterConfig) => path6.join(reactRouterConfig.buildDirectory, "client");
+var defaultEntriesDir = path6.resolve(
+  path6.dirname(require.resolve("@react-router/dev/package.json")),
   "dist",
   "config",
   "defaults"
 );
-var defaultEntries = fse.readdirSync(defaultEntriesDir).map((filename3) => path4.join(defaultEntriesDir, filename3));
+var defaultEntries = fse.readdirSync(defaultEntriesDir).map((filename3) => path6.join(defaultEntriesDir, filename3));
 invariant(defaultEntries.length > 0, "No default entries found");
 var reactRouterDevLoadContext = () => ({});
 var reactRouterVitePlugin = () => {
@@ -1510,7 +1525,7 @@ var reactRouterVitePlugin = () => {
       virtual.serverManifest.id
     )};
       export const assetsBuildDirectory = ${JSON.stringify(
-      path4.relative(
+      path6.relative(
         ctx.rootDirectory,
         getClientBuildDirectory(ctx.reactRouterConfig)
       )
@@ -1536,7 +1551,7 @@ var reactRouterVitePlugin = () => {
   };
   let loadViteManifest = async (directory) => {
     let manifestContents = await fse.readFile(
-      path4.resolve(directory, ".vite", "manifest.json"),
+      path6.resolve(directory, ".vite", "manifest.json"),
       "utf-8"
     );
     return JSON.parse(manifestContents);
@@ -1572,7 +1587,7 @@ var reactRouterVitePlugin = () => {
       ctx
     );
     for (let [key, route] of Object.entries(ctx.reactRouterConfig.routes)) {
-      let routeFilePath = path4.join(
+      let routeFilePath = path6.join(
         ctx.reactRouterConfig.appDirectory,
         route.file
       );
@@ -1607,7 +1622,7 @@ var reactRouterVitePlugin = () => {
     }
     let fingerprintedValues = { entry, routes: browserRoutes };
     let version = getHash(JSON.stringify(fingerprintedValues), 8);
-    let manifestPath = path4.posix.join(
+    let manifestPath = path6.posix.join(
       viteConfig.build.assetsDir,
       `manifest-${version}.js`
     );
@@ -1618,7 +1633,7 @@ var reactRouterVitePlugin = () => {
       ...nonFingerprintedValues
     };
     await writeFileSafe(
-      path4.join(getClientBuildDirectory(ctx.reactRouterConfig), manifestPath),
+      path6.join(getClientBuildDirectory(ctx.reactRouterConfig), manifestPath),
       `window.__reactRouterManifest=${JSON.stringify(
         reactRouterBrowserManifest
       )};`
@@ -1681,11 +1696,22 @@ var reactRouterVitePlugin = () => {
     {
       name: "react-router",
       config: async (_viteUserConfig, _viteConfigEnv) => {
-        await preloadViteEsm();
-        let vite2 = importViteEsmSync();
+        await preloadVite();
+        let vite2 = getVite();
         viteUserConfig = _viteUserConfig;
         viteConfigEnv = _viteConfigEnv;
         viteCommand = viteConfigEnv.command;
+        let viteClientConditions = [
+          ...vite2.defaultClientConditions ?? []
+        ];
+        let packageRoot = path6.dirname(
+          require.resolve("@react-router/dev/package.json")
+        );
+        let { moduleSyncEnabled } = await import(`file:///${path6.join(packageRoot, "module-sync-enabled/index.mjs")}`);
+        let viteServerConditions = [
+          ...vite2.defaultServerConditions ?? [],
+          ...moduleSyncEnabled ? ["module-sync"] : []
+        ];
         logger = vite2.createLogger(viteUserConfig.logLevel, {
           prefix: "[react-router]"
         });
@@ -1735,15 +1761,15 @@ var reactRouterVitePlugin = () => {
           ssr: {
             external: ssrExternals,
             resolve: {
-              conditions: viteCommand === "build" ? [] : ["development"],
-              externalConditions: viteCommand === "build" ? [] : ["development"]
+              conditions: viteCommand === "build" ? viteServerConditions : ["development", ...viteServerConditions],
+              externalConditions: viteCommand === "build" ? viteServerConditions : ["development", ...viteServerConditions]
             }
           },
           optimizeDeps: {
             entries: ctx.reactRouterConfig.future.unstable_optimizeDeps ? [
               ctx.entryClientFilePath,
               ...Object.values(ctx.reactRouterConfig.routes).map(
-                (route) => path4.join(ctx.reactRouterConfig.appDirectory, route.file)
+                (route) => path6.join(ctx.reactRouterConfig.appDirectory, route.file)
               )
             ] : [],
             include: [
@@ -1777,7 +1803,7 @@ var reactRouterVitePlugin = () => {
               "react-router/dom",
               "react-router-dom"
             ],
-            conditions: viteCommand === "build" ? [] : ["development"]
+            conditions: viteCommand === "build" ? viteClientConditions : ["development", ...viteClientConditions]
           },
           base: viteUserConfig.base,
           // When consumer provides an allow list for files that can be read by
@@ -1799,7 +1825,7 @@ var reactRouterVitePlugin = () => {
                   input: [
                     ctx.entryClientFilePath,
                     ...Object.values(ctx.reactRouterConfig.routes).map(
-                      (route) => `${path4.resolve(
+                      (route) => `${path6.resolve(
                         ctx.reactRouterConfig.appDirectory,
                         route.file
                       )}${BUILD_CLIENT_ROUTE_QUERY_STRING}`
@@ -1848,7 +1874,7 @@ var reactRouterVitePlugin = () => {
             "The React Router Vite plugin requires the use of a Vite config file"
           );
         }
-        let vite2 = importViteEsmSync();
+        let vite2 = getVite();
         let childCompilerConfigFile = await vite2.loadConfigFromFile(
           {
             command: viteConfig.command,
@@ -2007,8 +2033,8 @@ var reactRouterVitePlugin = () => {
           let ssrAssetPaths = getViteManifestAssetPaths(ssrViteManifest);
           let movedAssetPaths = [];
           for (let ssrAssetPath of ssrAssetPaths) {
-            let src = path4.join(serverBuildDirectory, ssrAssetPath);
-            let dest = path4.join(clientBuildDirectory, ssrAssetPath);
+            let src = path6.join(serverBuildDirectory, ssrAssetPath);
+            let dest = path6.join(clientBuildDirectory, ssrAssetPath);
             if (!fse.existsSync(dest)) {
               await fse.move(src, dest);
               movedAssetPaths.push(dest);
@@ -2021,7 +2047,7 @@ var reactRouterVitePlugin = () => {
           );
           await Promise.all(
             ssrCssPaths.map(
-              (cssPath) => fse.remove(path4.join(serverBuildDirectory, cssPath))
+              (cssPath) => fse.remove(path6.join(serverBuildDirectory, cssPath))
             )
           );
           if (movedAssetPaths.length) {
@@ -2030,7 +2056,7 @@ var reactRouterVitePlugin = () => {
                 "",
                 `${import_picocolors3.default.green("\u2713")} ${movedAssetPaths.length} asset${movedAssetPaths.length > 1 ? "s" : ""} moved from React Router server build to client assets.`,
                 ...movedAssetPaths.map(
-                  (movedAssetPath) => import_picocolors3.default.dim(path4.relative(ctx.rootDirectory, movedAssetPath))
+                  (movedAssetPath) => import_picocolors3.default.dim(path6.relative(ctx.rootDirectory, movedAssetPath))
                 ),
                 ""
               ].join("\n")
@@ -2077,7 +2103,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 = path4.basename(routeModuleId);
+        let routeFileName = path6.basename(routeModuleId);
         let sourceExports = await getRouteModuleExports(
           viteChildCompiler,
           ctx,
@@ -2139,9 +2165,9 @@ var reactRouterVitePlugin = () => {
         if (viteCommand !== "build" && importer.endsWith(".html")) {
           return;
         }
-        let vite2 = importViteEsmSync();
+        let vite2 = getVite();
         let importerShort = vite2.normalizePath(
-          path4.relative(ctx.rootDirectory, importer)
+          path6.relative(ctx.rootDirectory, importer)
         );
         let isRoute = getRoute(ctx.reactRouterConfig, importer);
         if (isRoute) {
@@ -2254,10 +2280,10 @@ var reactRouterVitePlugin = () => {
       },
       async load(id) {
         if (id !== virtualHmrRuntime.resolvedId) return;
-        let reactRefreshDir = path4.dirname(
+        let reactRefreshDir = path6.dirname(
           require.resolve("react-refresh/package.json")
         );
-        let reactRefreshRuntimePath = path4.join(
+        let reactRefreshRuntimePath = path6.join(
           reactRefreshDir,
           "cjs/react-refresh-runtime.development.js"
         );
@@ -2397,22 +2423,7 @@ function addRefreshWrapper(reactRouterConfig, code, id) {
     "links",
     "shouldRevalidate"
   ] : [];
-  return "\n\n" + withCommentBoundaries(
-    "REACT REFRESH HEADER",
-    REACT_REFRESH_HEADER.replaceAll("__SOURCE__", JSON.stringify(id))
-  ) + "\n\n" + withCommentBoundaries("REACT REFRESH BODY", code) + "\n\n" + withCommentBoundaries(
-    "REACT REFRESH FOOTER",
-    REACT_REFRESH_FOOTER.replaceAll("__SOURCE__", JSON.stringify(id)).replaceAll("__ACCEPT_EXPORTS__", JSON.stringify(acceptExports)).replaceAll("__ROUTE_ID__", JSON.stringify(route?.id))
-  ) + "\n";
-}
-function withCommentBoundaries(label, text) {
-  let begin = `// [BEGIN] ${label} `;
-  begin += "-".repeat(80 - begin.length);
-  let end = `// [END] ${label} `;
-  end += "-".repeat(80 - end.length);
-  return `${begin}
-${text}
-${end}`;
+  return REACT_REFRESH_HEADER.replaceAll("__SOURCE__", JSON.stringify(id)) + code + REACT_REFRESH_FOOTER.replaceAll("__SOURCE__", JSON.stringify(id)).replaceAll("__ACCEPT_EXPORTS__", JSON.stringify(acceptExports)).replaceAll("__ROUTE_ID__", JSON.stringify(route?.id));
 }
 var REACT_REFRESH_HEADER = `
 import RefreshRuntime from "${virtualHmrRuntime.id}";
@@ -2434,7 +2445,7 @@ if (import.meta.hot && !inWebWorker) {
     RefreshRuntime.register(type, __SOURCE__ + " " + id)
   };
   window.$RefreshSig$ = RefreshRuntime.createSignatureFunctionForTransform;
-}`.trim();
+}`.replaceAll("\n", "");
 var REACT_REFRESH_FOOTER = `
 if (import.meta.hot && !inWebWorker) {
   window.$RefreshReg$ = prevRefreshReg;
@@ -2448,11 +2459,11 @@ if (import.meta.hot && !inWebWorker) {
       if (invalidateMessage) import.meta.hot.invalidate(invalidateMessage);
     });
   });
-}`.trim();
+}`;
 function getRoute(pluginConfig, file) {
-  let vite2 = importViteEsmSync();
+  let vite2 = getVite();
   let routePath = vite2.normalizePath(
-    path4.relative(pluginConfig.appDirectory, file)
+    path6.relative(pluginConfig.appDirectory, file)
   );
   let route = Object.values(pluginConfig.routes).find(
     (r) => vite2.normalizePath(r.file) === routePath
@@ -2474,7 +2485,7 @@ async function getRouteMetadata(ctx, viteChildCompiler, route, readRouteFile) {
     caseSensitive: route.caseSensitive,
     url: combineURLs(
       ctx.publicPath,
-      "/" + path4.relative(
+      "/" + path6.relative(
         ctx.rootDirectory,
         resolveRelativeRouteFilePath(route, ctx.reactRouterConfig)
       )
@@ -2497,7 +2508,7 @@ async function getRouteMetadata(ctx, viteChildCompiler, route, readRouteFile) {
   return info;
 }
 async function getPrerenderBuildAndHandler(viteConfig, reactRouterConfig, serverBuildDirectory) {
-  let serverBuildPath = path4.join(
+  let serverBuildPath = path6.join(
     serverBuildDirectory,
     reactRouterConfig.serverBuildFile
   );
@@ -2519,9 +2530,9 @@ async function handleSpaMode(viteConfig, reactRouterConfig, serverBuildDirectory
   let html = await response.text();
   validatePrerenderedResponse(response, html, "SPA Mode", "/");
   validatePrerenderedHtml(html, "SPA Mode");
-  await fse.writeFile(path4.join(clientBuildDirectory, "index.html"), html);
+  await fse.writeFile(path6.join(clientBuildDirectory, "index.html"), html);
   viteConfig.logger.info(
-    "SPA Mode: index.html has been written to your " + import_picocolors3.default.bold(path4.relative(process.cwd(), clientBuildDirectory)) + " directory"
+    "SPA Mode: index.html has been written to your " + import_picocolors3.default.bold(path6.relative(process.cwd(), clientBuildDirectory)) + " directory"
   );
 }
 async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirectory, clientBuildDirectory) {
@@ -2551,14 +2562,14 @@ async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirecto
     // build time or runtime
     "X-React-Router-Prerender": "yes"
   };
-  for (let path5 of routesToPrerender) {
-    let matches = (0, import_react_router2.matchRoutes)(routes, path5);
+  for (let path7 of routesToPrerender) {
+    let matches = (0, import_react_router2.matchRoutes)(routes, `/${path7}/`.replace(/^\/\/+/, "/"));
     let hasLoaders = matches?.some((m) => m.route.loader);
     let data;
     if (hasLoaders) {
       data = await prerenderData(
         handler,
-        path5,
+        path7,
         clientBuildDirectory,
         reactRouterConfig,
         viteConfig,
@@ -2571,7 +2582,7 @@ async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirecto
     if (isResourceRoute) {
       await prerenderResourceRoute(
         handler,
-        path5,
+        path7,
         clientBuildDirectory,
         reactRouterConfig,
         viteConfig,
@@ -2580,7 +2591,7 @@ async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirecto
     } else {
       await prerenderRoute(
         handler,
-        path5,
+        path7,
         clientBuildDirectory,
         reactRouterConfig,
         viteConfig,
@@ -2637,9 +2648,9 @@ async function prerenderData(handler, prerenderPath, clientBuildDirectory, react
   let response = await handler(request);
   let data = await response.text();
   validatePrerenderedResponse(response, data, "Prerender", normalizedPath);
-  let outdir = path4.relative(process.cwd(), clientBuildDirectory);
-  let outfile = path4.join(outdir, ...normalizedPath.split("/"));
-  await fse.ensureDir(path4.dirname(outfile));
+  let outdir = path6.relative(process.cwd(), clientBuildDirectory);
+  let outfile = path6.join(outdir, ...normalizedPath.split("/"));
+  await fse.ensureDir(path6.dirname(outfile));
   await fse.outputFile(outfile, data);
   viteConfig.logger.info(`Prerender: Generated ${import_picocolors3.default.bold(outfile)}`);
   return data;
@@ -2656,9 +2667,9 @@ async function prerenderRoute(handler, prerenderPath, clientBuildDirectory, reac
   if (!reactRouterConfig.ssr) {
     validatePrerenderedHtml(html, "Prerender");
   }
-  let outdir = path4.relative(process.cwd(), clientBuildDirectory);
-  let outfile = path4.join(outdir, ...normalizedPath.split("/"), "index.html");
-  await fse.ensureDir(path4.dirname(outfile));
+  let outdir = path6.relative(process.cwd(), clientBuildDirectory);
+  let outfile = path6.join(outdir, ...normalizedPath.split("/"), "index.html");
+  await fse.ensureDir(path6.dirname(outfile));
   await fse.outputFile(outfile, html);
   viteConfig.logger.info(`Prerender: Generated ${import_picocolors3.default.bold(outfile)}`);
 }
@@ -2668,9 +2679,9 @@ async function prerenderResourceRoute(handler, prerenderPath, clientBuildDirecto
   let response = await handler(request);
   let text = await response.text();
   validatePrerenderedResponse(response, text, "Prerender", normalizedPath);
-  let outdir = path4.relative(process.cwd(), clientBuildDirectory);
-  let outfile = path4.join(outdir, ...normalizedPath.split("/"));
-  await fse.ensureDir(path4.dirname(outfile));
+  let outdir = path6.relative(process.cwd(), clientBuildDirectory);
+  let outfile = path6.join(outdir, ...normalizedPath.split("/"));
+  await fse.ensureDir(path6.dirname(outfile));
   await fse.outputFile(outfile, text);
   viteConfig.logger.info(`Prerender: Generated ${import_picocolors3.default.bold(outfile)}`);
 }
@@ -2679,17 +2690,17 @@ async function prerenderManifest(build, clientBuildDirectory, reactRouterConfig,
     /\/\/+/g,
     "/"
   );
-  let outdir = path4.relative(process.cwd(), clientBuildDirectory);
-  let outfile = path4.join(outdir, ...normalizedPath.split("/"));
-  await fse.ensureDir(path4.dirname(outfile));
+  let outdir = path6.relative(process.cwd(), clientBuildDirectory);
+  let outfile = path6.join(outdir, ...normalizedPath.split("/"));
+  await fse.ensureDir(path6.dirname(outfile));
   let manifestData = JSON.stringify(build.assets.routes);
   await fse.outputFile(outfile, manifestData);
   viteConfig.logger.info(`Prerender: Generated ${import_picocolors3.default.bold(outfile)}`);
 }
-function validatePrerenderedResponse(response, html, prefix, path5) {
+function validatePrerenderedResponse(response, html, prefix, path7) {
   if (response.status !== 200) {
     throw new Error(
-      `${prefix}: Received a ${response.status} status code from \`entry.server.tsx\` while prerendering the \`${path5}\` path.
+      `${prefix}: Received a ${response.status} status code from \`entry.server.tsx\` while prerendering the \`${path7}\` path.
 ${html}`
     );
   }