@react-router/dev 0.0.0-experimental-89dc2043e → 0.0.0-experimental-6844c5934

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-89dc2043e
+ * @react-router/dev v0.0.0-experimental-6844c5934
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -47,7 +47,7 @@ module.exports = __toCommonJS(vite_exports);
 // vite/plugin.ts
 var import_node_crypto = require("crypto");
 var path4 = __toESM(require("path"));
-var url2 = __toESM(require("url"));
+var url = __toESM(require("url"));
 var fse = __toESM(require("fs-extra"));
 var babel = __toESM(require("@babel/core"));
 var import_react_router2 = require("react-router");
@@ -119,11 +119,11 @@ async function createContext(viteConfig = {}) {
   const runner = new import_client.ViteNodeRunner({
     root: devServer.config.root,
     base: devServer.config.base,
-    fetchModule(id2) {
-      return server.fetchModule(id2);
+    fetchModule(id) {
+      return server.fetchModule(id);
     },
-    resolveId(id2, importer) {
-      return server.resolveId(id2, importer);
+    resolveId(id, importer) {
+      return server.resolveId(id, importer);
     }
   });
   return { devServer, server, runner };
@@ -195,24 +195,24 @@ ${message}`
 function configRoutesToRouteManifest(appDirectory, routes, rootId = "root") {
   let routeManifest = {};
   function walk(route, parentId) {
-    let id2 = route.id || createRouteId(route.file);
+    let id = route.id || createRouteId(route.file);
     let manifestItem = {
-      id: id2,
+      id,
       parentId,
       file: Path.isAbsolute(route.file) ? Path.relative(appDirectory, route.file) : route.file,
       path: route.path,
       index: route.index,
       caseSensitive: route.caseSensitive
     };
-    if (routeManifest.hasOwnProperty(id2)) {
+    if (routeManifest.hasOwnProperty(id)) {
       throw new Error(
-        `Unable to define routes with duplicate route id: "${id2}"`
+        `Unable to define routes with duplicate route id: "${id}"`
       );
     }
-    routeManifest[id2] = manifestItem;
+    routeManifest[id] = manifestItem;
     if (route.children) {
       for (let child of route.children) {
-        walk(child, id2);
+        walk(child, id);
       }
     }
   }
@@ -641,7 +641,7 @@ function generate(ctx, route) {
     const indent = i === 0 ? "" : "  ".repeat(2);
     let source = noExtension(rel);
     if (!source.startsWith("../")) source = "./" + source;
-    return `${indent}import type { Info as Parent${i} } from "${source}"`;
+    return `${indent}import type { Info as Parent${i} } from "${source}.js"`;
   }).join("\n");
   return import_dedent.default`
     // React Router generated types for route:
@@ -651,14 +651,16 @@ function generate(ctx, route) {
 
     ${parentTypeImports}
 
-    type Module = typeof import("../${Pathe2.filename(route.file)}")
+    type Module = typeof import("../${Pathe2.filename(route.file)}.js")
 
     export type Info = {
       parents: [${parents.map((_, i) => `Parent${i}`).join(", ")}],
       id: "${route.id}"
       file: "${route.file}"
       path: "${route.path}"
-      params: {${formatParamProperties(urlpath)}}
+      params: {${formatParamProperties(
+    urlpath
+  )}} & { [key: string]: string | undefined }
       module: Module
       loaderData: T.CreateLoaderData<Module>
       actionData: T.CreateActionData<Module>
@@ -810,7 +812,7 @@ function fromNodeRequest(nodeReq, nodeRes) {
     nodeReq.originalUrl,
     "Expected `nodeReq.originalUrl` to be defined"
   );
-  let url3 = new URL(nodeReq.originalUrl, origin);
+  let url2 = new URL(nodeReq.originalUrl, origin);
   let controller = new AbortController();
   let init = {
     method: nodeReq.method,
@@ -823,7 +825,7 @@ function fromNodeRequest(nodeReq, nodeRes) {
     init.body = (0, import_node.createReadableStreamFromReadable)(nodeReq);
     init.duplex = "half";
   }
-  return new Request(url3.href, init);
+  return new Request(url2.href, init);
 }
 async function toNodeRequest(res, nodeRes) {
   nodeRes.statusCode = res.status;
@@ -869,8 +871,8 @@ var cssModulesRegExp = new RegExp(`\\.module${cssFileRegExp.source}`);
 var isCssFile = (file) => cssFileRegExp.test(file);
 var isCssModulesFile = (file) => cssModulesRegExp.test(file);
 var cssUrlParamsWithoutSideEffects = ["url", "inline", "raw", "inline-css"];
-var isCssUrlWithoutSideEffects = (url3) => {
-  let queryString = url3.split("?")[1];
+var isCssUrlWithoutSideEffects = (url2) => {
+  let queryString = url2.split("?")[1];
   if (!queryString) {
     return false;
   }
@@ -878,19 +880,22 @@ var isCssUrlWithoutSideEffects = (url3) => {
   for (let paramWithoutSideEffects of cssUrlParamsWithoutSideEffects) {
     if (
       // Parameter is blank and not explicitly set, i.e. "?url", not "?url="
-      params.get(paramWithoutSideEffects) === "" && !url3.includes(`?${paramWithoutSideEffects}=`) && !url3.includes(`&${paramWithoutSideEffects}=`)
+      params.get(paramWithoutSideEffects) === "" && !url2.includes(`?${paramWithoutSideEffects}=`) && !url2.includes(`&${paramWithoutSideEffects}=`)
     ) {
       return true;
     }
   }
   return false;
 };
+var injectQuery = (url2, query) => url2.includes("?") ? url2.replace("?", `?${query}&`) : `${url2}?${query}`;
 var getStylesForFiles = async ({
   viteDevServer,
   rootDirectory,
   cssModulesManifest,
   files
 }) => {
+  let vite2 = importViteEsmSync();
+  let viteMajor = parseInt(vite2.version.split(".")[0], 10);
   let styles = {};
   let deps = /* @__PURE__ */ new Set();
   try {
@@ -919,7 +924,15 @@ var getStylesForFiles = async ({
   for (let dep of deps) {
     if (dep.file && isCssFile(dep.file) && !isCssUrlWithoutSideEffects(dep.url)) {
       try {
-        let css = isCssModulesFile(dep.file) ? cssModulesManifest[dep.file] : (await viteDevServer.ssrLoadModule(dep.url)).default;
+        let css = isCssModulesFile(dep.file) ? cssModulesManifest[dep.file] : (await viteDevServer.ssrLoadModule(
+          // We need the ?inline query in Vite v6 when loading CSS in SSR
+          // since it does not expose the default export for CSS in a
+          // server environment. This is to align with non-SSR
+          // environments. For backwards compatibility with v5 we keep
+          // using the URL without ?inline query because the HMR code was
+          // relying on the implicit SSR-client module graph relationship.
+          viteMajor >= 6 ? injectQuery(dep.url, "inline") : dep.url
+        )).default;
         if (css === void 0) {
           throw new Error();
         }
@@ -943,8 +956,8 @@ var findDeps = async (vite2, node, deps) => {
       await findDeps(vite2, node2, deps);
     }
   }
-  async function addFromUrl(url3) {
-    let node2 = await vite2.moduleGraph.getModuleByUrl(url3);
+  async function addFromUrl(url2) {
+    let node2 = await vite2.moduleGraph.getModuleByUrl(url2);
     if (node2) {
       await addFromNode(node2);
     }
@@ -952,7 +965,7 @@ var findDeps = async (vite2, node, deps) => {
   if (node.ssrTransformResult) {
     if (node.ssrTransformResult.deps) {
       node.ssrTransformResult.deps.forEach(
-        (url3) => branches.push(addFromUrl(url3))
+        (url2) => branches.push(addFromUrl(url2))
       );
     }
   } else {
@@ -986,14 +999,14 @@ var getStylesForUrl = async ({
   entryClientFilePath,
   cssModulesManifest,
   build,
-  url: url3
+  url: url2
 }) => {
-  if (url3 === void 0 || url3.includes("?_data=")) {
+  if (url2 === void 0 || url2.includes("?_data=")) {
     return void 0;
   }
   let routes = createRoutes(build.routes);
   let appPath = path3.relative(process.cwd(), reactRouterConfig.appDirectory);
-  let documentRouteFiles = (0, import_react_router.matchRoutes)(routes, url3, build.basename)?.map(
+  let documentRouteFiles = (0, import_react_router.matchRoutes)(routes, url2, build.basename)?.map(
     (match) => path3.resolve(appPath, reactRouterConfig.routes[match.route.id].file)
   ) ?? [];
   let styles = await getStylesForFiles({
@@ -1010,10 +1023,15 @@ var getStylesForUrl = async ({
   return styles;
 };
 
-// vite/vmod.ts
-var id = (name) => `virtual:react-router/${name}`;
-var resolve3 = (id2) => `\0${id2}`;
-var url = (id2) => `/@id/__x00__${id2}`;
+// vite/virtual-module.ts
+function create(name) {
+  let id = `virtual:react-router/${name}`;
+  return {
+    id,
+    resolvedId: `\0${id}`,
+    url: `/@id/__x00__${id}`
+  };
+}
 
 // vite/combine-urls.ts
 function combineURLs(baseURL, relativeURL) {
@@ -1062,14 +1080,14 @@ var removeExports = (ast, exportsToRemove) => {
           }
         }
         if (path5.node.declaration?.type === "FunctionDeclaration") {
-          let id2 = path5.node.declaration.id;
-          if (id2 && exportsToRemove.includes(id2.name)) {
+          let id = path5.node.declaration.id;
+          if (id && exportsToRemove.includes(id.name)) {
             markedForRemoval.add(path5);
           }
         }
         if (path5.node.declaration?.type === "ClassDeclaration") {
-          let id2 = path5.node.declaration.id;
-          if (id2 && exportsToRemove.includes(id2.name)) {
+          let id = path5.node.declaration.id;
+          if (id && exportsToRemove.includes(id.name)) {
             markedForRemoval.add(path5);
           }
         }
@@ -1086,9 +1104,9 @@ var removeExports = (ast, exportsToRemove) => {
     (0, import_babel_dead_code_elimination.deadCodeElimination)(ast, previouslyReferencedIdentifiers);
   }
 };
-function validateDestructuredExports(id2, exportsToRemove) {
-  if (id2.type === "ArrayPattern") {
-    for (let element of id2.elements) {
+function validateDestructuredExports(id, exportsToRemove) {
+  if (id.type === "ArrayPattern") {
+    for (let element of id.elements) {
       if (!element) {
         continue;
       }
@@ -1103,8 +1121,8 @@ function validateDestructuredExports(id2, exportsToRemove) {
       }
     }
   }
-  if (id2.type === "ObjectPattern") {
-    for (let property of id2.properties) {
+  if (id.type === "ObjectPattern") {
+    for (let property of id.properties) {
       if (!property) {
         continue;
       }
@@ -1128,16 +1146,16 @@ function invalidDestructureError(name) {
 
 // vite/with-props.ts
 var import_dedent2 = __toESM(require("dedent"));
-var vmodId = id("with-props");
+var vmod = create("with-props");
 var NAMED_COMPONENT_EXPORTS = ["HydrateFallback", "ErrorBoundary"];
 var plugin = {
   name: "react-router-with-props",
   enforce: "pre",
-  resolveId(id2) {
-    if (id2 === vmodId) return resolve3(vmodId);
+  resolveId(id) {
+    if (id === vmod.id) return vmod.resolvedId;
   },
-  async load(id2) {
-    if (id2 !== resolve3(vmodId)) return;
+  async load(id) {
+    if (id !== vmod.resolvedId) return;
     return import_dedent2.default`
       import { createElement as h } from "react";
       import { useActionData, useLoaderData, useMatches, useParams, useRouteError } from "react-router";
@@ -1199,12 +1217,12 @@ var transform = (ast) => {
         const decl = path5.get("declaration");
         if (decl.isVariableDeclaration()) {
           decl.get("declarations").forEach((varDeclarator) => {
-            const id2 = varDeclarator.get("id");
+            const id = varDeclarator.get("id");
             const init = varDeclarator.get("init");
             const expr = init.node;
             if (!expr) return;
-            if (!id2.isIdentifier()) return;
-            const { name } = id2.node;
+            if (!id.isIdentifier()) return;
+            const { name } = id.node;
             if (!NAMED_COMPONENT_EXPORTS.includes(name)) return;
             const uid = getHocUid(path5, `with${name}Props`);
             init.replaceWith(t.callExpression(uid, [expr]));
@@ -1212,9 +1230,9 @@ var transform = (ast) => {
           return;
         }
         if (decl.isFunctionDeclaration()) {
-          const { id: id2 } = decl.node;
-          if (!id2) return;
-          const { name } = id2;
+          const { id } = decl.node;
+          if (!id) return;
+          const { name } = id;
           if (!NAMED_COMPONENT_EXPORTS.includes(name)) return;
           const uid = getHocUid(path5, `with${name}Props`);
           decl.replaceWith(
@@ -1235,7 +1253,7 @@ var transform = (ast) => {
         hocs.map(
           ([name, identifier]) => t.importSpecifier(identifier, t.identifier(name))
         ),
-        t.stringLiteral(vmodId)
+        t.stringLiteral(vmod.id)
       )
     );
   }
@@ -1264,27 +1282,23 @@ var CLIENT_ROUTE_EXPORTS = [
   "meta",
   "shouldRevalidate"
 ];
-var ROUTE_ENTRY_QUERY_STRING = "?route-entry=1";
-var isRouteEntry = (id2) => {
-  return id2.endsWith(ROUTE_ENTRY_QUERY_STRING);
-};
-var serverBuildId = id("server-build");
-var serverManifestId = id("server-manifest");
-var browserManifestId = id("browser-manifest");
-var hmrRuntimeId = id("hmr-runtime");
-var injectHmrRuntimeId = id("inject-hmr-runtime");
+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 file = route.file;
   let fullPath = path4.resolve(reactRouterConfig.appDirectory, file);
   return vite2.normalizePath(fullPath);
 };
-var vmods = [serverBuildId, serverManifestId, browserManifestId];
+var virtual = {
+  serverBuild: create("server-build"),
+  serverManifest: create("server-manifest"),
+  browserManifest: create("browser-manifest")
+};
 var invalidateVirtualModules = (viteDevServer) => {
-  vmods.forEach((vmod) => {
-    let mod = viteDevServer.moduleGraph.getModuleById(
-      resolve3(vmod)
-    );
+  Object.values(virtual).forEach((vmod2) => {
+    let mod = viteDevServer.moduleGraph.getModuleById(vmod2.resolvedId);
     if (mod) {
       viteDevServer.moduleGraph.invalidateModule(mod);
     }
@@ -1299,7 +1313,7 @@ var resolveChunk = (ctx, viteManifest, absoluteFilePath) => {
   let rootRelativeFilePath = vite2.normalizePath(
     path4.relative(ctx.rootDirectory, absoluteFilePath)
   );
-  let entryChunk = viteManifest[rootRelativeFilePath + ROUTE_ENTRY_QUERY_STRING] ?? viteManifest[rootRelativeFilePath];
+  let entryChunk = viteManifest[rootRelativeFilePath + BUILD_CLIENT_ROUTE_QUERY_STRING] ?? viteManifest[rootRelativeFilePath];
   if (!entryChunk) {
     let knownManifestKeys = Object.keys(viteManifest).map((key) => '"' + key + '"').join(", ");
     throw new Error(
@@ -1372,19 +1386,19 @@ var getRouteModuleExports = async (viteChildCompiler, ctx, routeFile, readRouteF
   let ssr = true;
   let { pluginContainer, moduleGraph } = viteChildCompiler;
   let routePath = path4.resolve(ctx.reactRouterConfig.appDirectory, routeFile);
-  let url3 = resolveFileUrl(ctx, routePath);
+  let url2 = resolveFileUrl(ctx, routePath);
   let resolveId = async () => {
-    let result = await pluginContainer.resolveId(url3, void 0, { ssr });
-    if (!result) throw new Error(`Could not resolve module ID for ${url3}`);
+    let result = await pluginContainer.resolveId(url2, void 0, { ssr });
+    if (!result) throw new Error(`Could not resolve module ID for ${url2}`);
     return result.id;
   };
-  let [id2, code] = await Promise.all([
+  let [id, code] = await Promise.all([
     resolveId(),
     readRouteFile?.() ?? fse.readFile(routePath, "utf-8"),
     // pluginContainer.transform(...) fails if we don't do this first:
-    moduleGraph.ensureEntryFromUrl(url3, ssr)
+    moduleGraph.ensureEntryFromUrl(url2, ssr)
   ]);
-  let transformed = await pluginContainer.transform(code, id2, { ssr });
+  let transformed = await pluginContainer.transform(code, id, { ssr });
   let [, exports2] = (0, import_es_module_lexer.parse)(transformed.code);
   let exportNames = exports2.map((e) => e.n);
   return exportNames;
@@ -1489,10 +1503,12 @@ var reactRouterVitePlugin = () => {
         resolveFileUrl(
           ctx,
           resolveRelativeRouteFilePath(route, ctx.reactRouterConfig)
-        ) + ROUTE_ENTRY_QUERY_STRING
+        )
       )};`;
     }).join("\n")}
-      export { default as assets } from ${JSON.stringify(serverManifestId)};
+      export { default as assets } from ${JSON.stringify(
+      virtual.serverManifest.id
+    )};
       export const assetsBuildDirectory = ${JSON.stringify(
       path4.relative(
         ctx.rootDirectory,
@@ -1595,8 +1611,8 @@ var reactRouterVitePlugin = () => {
       viteConfig.build.assetsDir,
       `manifest-${version}.js`
     );
-    let url3 = `${ctx.publicPath}${manifestPath}`;
-    let nonFingerprintedValues = { url: url3, version };
+    let url2 = `${ctx.publicPath}${manifestPath}`;
+    let nonFingerprintedValues = { url: url2, version };
     let reactRouterBrowserManifest = {
       ...fingerprintedValues,
       ...nonFingerprintedValues
@@ -1632,10 +1648,10 @@ var reactRouterVitePlugin = () => {
         caseSensitive: route.caseSensitive,
         module: combineURLs(
           ctx.publicPath,
-          `${resolveFileUrl(
+          resolveFileUrl(
             ctx,
             resolveRelativeRouteFilePath(route, ctx.reactRouterConfig)
-          )}${ROUTE_ENTRY_QUERY_STRING}`
+          )
         ),
         hasAction: sourceExports.includes("action"),
         hasLoader: sourceExports.includes("loader"),
@@ -1647,12 +1663,9 @@ var reactRouterVitePlugin = () => {
     }
     return {
       version: String(Math.random()),
-      url: combineURLs(ctx.publicPath, url(browserManifestId)),
+      url: combineURLs(ctx.publicPath, virtual.browserManifest.url),
       hmr: {
-        runtime: combineURLs(
-          ctx.publicPath,
-          url(injectHmrRuntimeId)
-        )
+        runtime: combineURLs(ctx.publicPath, virtualInjectHmrRuntime.url)
       },
       entry: {
         module: combineURLs(
@@ -1789,7 +1802,7 @@ var reactRouterVitePlugin = () => {
                       (route) => `${path4.resolve(
                         ctx.reactRouterConfig.appDirectory,
                         route.file
-                      )}${ROUTE_ENTRY_QUERY_STRING}`
+                      )}${BUILD_CLIENT_ROUTE_QUERY_STRING}`
                     )
                   ]
                 }
@@ -1808,7 +1821,7 @@ var reactRouterVitePlugin = () => {
                 rollupOptions: {
                   ...baseRollupOptions,
                   preserveEntrySignatures: "exports-only",
-                  input: viteUserConfig.build?.rollupOptions?.input ?? serverBuildId,
+                  input: viteUserConfig.build?.rollupOptions?.input ?? virtual.serverBuild.id,
                   output: {
                     entryFileNames: ctx.reactRouterConfig.serverBuildFile,
                     format: ctx.reactRouterConfig.serverModuleFormat
@@ -1871,15 +1884,15 @@ var reactRouterVitePlugin = () => {
           envFile: false,
           plugins: [
             ...(childCompilerConfigFile.config.plugins ?? []).flat().filter(
-              (plugin2) => typeof plugin2 === "object" && plugin2 !== null && "name" in plugin2 && plugin2.name !== "react-router" && plugin2.name !== "react-router-route-exports" && plugin2.name !== "react-router-hmr-updates"
+              (plugin2) => typeof plugin2 === "object" && plugin2 !== null && "name" in plugin2 && plugin2.name !== "react-router" && plugin2.name !== "react-router:route-exports" && plugin2.name !== "react-router:hmr-updates"
             )
           ]
         });
         await viteChildCompiler.pluginContainer.buildStart({});
       },
-      async transform(code, id2) {
-        if (isCssModulesFile(id2)) {
-          cssModulesManifest[id2] = code;
+      async transform(code, id) {
+        if (isCssModulesFile(id)) {
+          cssModulesManifest[id] = code;
         }
       },
       buildStart() {
@@ -1903,7 +1916,7 @@ var reactRouterVitePlugin = () => {
         (0, import_react_router2.unstable_setDevServerHooks)({
           // Give the request handler access to the critical CSS in dev to avoid a
           // flash of unstyled content since Vite injects CSS file contents via JS
-          getCriticalCss: async (build, url3) => {
+          getCriticalCss: async (build, url2) => {
             return getStylesForUrl({
               rootDirectory: ctx.rootDirectory,
               entryClientFilePath: ctx.entryClientFilePath,
@@ -1911,7 +1924,7 @@ var reactRouterVitePlugin = () => {
               viteDevServer,
               cssModulesManifest,
               build,
-              url: url3
+              url: url2
             });
           },
           // If an error is caught within the request handler, let Vite fix the
@@ -1959,7 +1972,7 @@ var reactRouterVitePlugin = () => {
             viteDevServer.middlewares.use(async (req, res, next) => {
               try {
                 let build = await viteDevServer.ssrLoadModule(
-                  serverBuildId
+                  virtual.serverBuild.id
                 );
                 let handler = (0, import_react_router2.createRequestHandler)(build, "development");
                 let nodeHandler = async (nodeReq, nodeRes) => {
@@ -2059,11 +2072,11 @@ var reactRouterVitePlugin = () => {
       }
     },
     {
-      name: "react-router-route-entry",
+      name: "react-router:build-client-route",
       enforce: "pre",
-      async transform(_code, id2, options) {
-        if (!isRouteEntry(id2)) return;
-        let routeModuleId = id2.replace(ROUTE_ENTRY_QUERY_STRING, "");
+      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 sourceExports = await getRouteModuleExports(
           viteChildCompiler,
@@ -2077,23 +2090,24 @@ var reactRouterVitePlugin = () => {
       }
     },
     {
-      name: "react-router-virtual-modules",
+      name: "react-router:virtual-modules",
       enforce: "pre",
-      resolveId(id2) {
-        if (vmods.includes(id2)) return resolve3(id2);
+      resolveId(id) {
+        const vmod2 = Object.values(virtual).find((vmod3) => vmod3.id === id);
+        if (vmod2) return vmod2.resolvedId;
       },
-      async load(id2) {
-        switch (id2) {
-          case resolve3(serverBuildId): {
+      async load(id) {
+        switch (id) {
+          case virtual.serverBuild.resolvedId: {
             return await getServerEntry();
           }
-          case resolve3(serverManifestId): {
+          case virtual.serverManifest.resolvedId: {
             let reactRouterManifest = ctx.isSsrBuild ? await ctx.getReactRouterServerManifest() : await getReactRouterManifestForDev();
             return `export default ${(0, import_jsesc.default)(reactRouterManifest, {
               es6: true
             })};`;
           }
-          case resolve3(browserManifestId): {
+          case virtual.browserManifest.resolvedId: {
             if (viteCommand === "build") {
               throw new Error("This module only exists in development");
             }
@@ -2107,15 +2121,15 @@ var reactRouterVitePlugin = () => {
       }
     },
     {
-      name: "react-router-dot-server",
+      name: "react-router:dot-server",
       enforce: "pre",
-      async resolveId(id2, importer, options) {
+      async resolveId(id, importer, options) {
         let isOptimizeDeps = viteCommand === "serve" && options?.scan === true;
         if (isOptimizeDeps || options?.ssr) return;
-        let isResolving = options?.custom?.["react-router-dot-server"] ?? false;
+        let isResolving = options?.custom?.["react-router:dot-server"] ?? false;
         if (isResolving) return;
-        options.custom = { ...options.custom, "react-router-dot-server": true };
-        let resolved = await this.resolve(id2, importer, options);
+        options.custom = { ...options.custom, "react-router:dot-server": true };
+        let resolved = await this.resolve(id, importer, options);
         if (!resolved) return;
         let serverFileRE = /\.server(\.[cm]?[jt]sx?)?$/;
         let serverDirRE = /\/\.server\//;
@@ -2138,12 +2152,12 @@ var reactRouterVitePlugin = () => {
             [
               import_picocolors3.default.red(`Server-only module referenced by client`),
               "",
-              `    '${id2}' imported by route '${importerShort}'`,
+              `    '${id}' imported by route '${importerShort}'`,
               "",
               `  React Router automatically removes server-code from these exports:`,
               `    ${serverOnlyExports}`,
               "",
-              `  But other route exports in '${importerShort}' depend on '${id2}'.`,
+              `  But other route exports in '${importerShort}' depend on '${id}'.`,
               "",
               "  See https://remix.run/docs/en/main/guides/vite#splitting-up-client-and-server-code",
               ""
@@ -2154,7 +2168,7 @@ var reactRouterVitePlugin = () => {
           [
             import_picocolors3.default.red(`Server-only module referenced by client`),
             "",
-            `    '${id2}' imported by '${importerShort}'`,
+            `    '${id}' imported by '${importerShort}'`,
             "",
             "  See https://remix.run/docs/en/main/guides/vite#splitting-up-client-and-server-code",
             ""
@@ -2163,12 +2177,12 @@ var reactRouterVitePlugin = () => {
       }
     },
     {
-      name: "react-router-dot-client",
-      async transform(code, id2, options) {
+      name: "react-router:dot-client",
+      async transform(code, id, options) {
         if (!options?.ssr) return;
         let clientFileRE = /\.client(\.[cm]?[jt]sx?)?$/;
         let clientDirRE = /\/\.client\//;
-        if (clientFileRE.test(id2) || clientDirRE.test(id2)) {
+        if (clientFileRE.test(id) || clientDirRE.test(id)) {
           let exports2 = (0, import_es_module_lexer.parse)(code)[1];
           return {
             code: exports2.map(
@@ -2181,9 +2195,9 @@ var reactRouterVitePlugin = () => {
     },
     plugin,
     {
-      name: "react-router-route-exports",
-      async transform(code, id2, options) {
-        let route = getRoute(ctx.reactRouterConfig, id2);
+      name: "react-router:route-exports",
+      async transform(code, id, options) {
+        let route = getRoute(ctx.reactRouterConfig, id);
         if (!route) return;
         if (!options?.ssr && !ctx.reactRouterConfig.ssr) {
           let serverOnlyExports = (0, import_es_module_lexer.parse)(code)[1].map((exp) => exp.n).filter((exp) => SERVER_ONLY_ROUTE_EXPORTS.includes(exp));
@@ -2200,7 +2214,7 @@ var reactRouterVitePlugin = () => {
             }
           }
         }
-        let [filepath] = id2.split("?");
+        let [filepath] = id.split("?");
         let ast = (0, import_parser.parse)(code, { sourceType: "module" });
         if (!options?.ssr) {
           removeExports(ast, SERVER_ONLY_ROUTE_EXPORTS);
@@ -2208,22 +2222,23 @@ var reactRouterVitePlugin = () => {
         transform(ast);
         return generate2(ast, {
           sourceMaps: true,
-          filename: id2,
+          filename: id,
           sourceFileName: filepath
         });
       }
     },
     {
-      name: "react-router-inject-hmr-runtime",
+      name: "react-router:inject-hmr-runtime",
       enforce: "pre",
-      resolveId(id2) {
-        if (id2 === injectHmrRuntimeId)
-          return resolve3(injectHmrRuntimeId);
+      resolveId(id) {
+        if (id === virtualInjectHmrRuntime.id) {
+          return virtualInjectHmrRuntime.resolvedId;
+        }
       },
-      async load(id2) {
-        if (id2 !== resolve3(injectHmrRuntimeId)) return;
+      async load(id) {
+        if (id !== virtualInjectHmrRuntime.resolvedId) return;
         return [
-          `import RefreshRuntime from "${hmrRuntimeId}"`,
+          `import RefreshRuntime from "${virtualHmrRuntime.id}"`,
           "RefreshRuntime.injectIntoGlobalHook(window)",
           "window.$RefreshReg$ = () => {}",
           "window.$RefreshSig$ = () => (type) => type",
@@ -2232,13 +2247,13 @@ var reactRouterVitePlugin = () => {
       }
     },
     {
-      name: "react-router-hmr-runtime",
+      name: "react-router:hmr-runtime",
       enforce: "pre",
-      resolveId(id2) {
-        if (id2 === hmrRuntimeId) return resolve3(hmrRuntimeId);
+      resolveId(id) {
+        if (id === virtualHmrRuntime.id) return virtualHmrRuntime.resolvedId;
       },
-      async load(id2) {
-        if (id2 !== resolve3(hmrRuntimeId)) return;
+      async load(id) {
+        if (id !== virtualHmrRuntime.resolvedId) return;
         let reactRefreshDir = path4.dirname(
           require.resolve("react-refresh/package.json")
         );
@@ -2258,11 +2273,11 @@ var reactRouterVitePlugin = () => {
       }
     },
     {
-      name: "react-router-react-refresh-babel",
-      async transform(code, id2, options) {
+      name: "react-router:react-refresh-babel",
+      async transform(code, id, options) {
         if (viteCommand !== "serve") return;
-        if (id2.includes("/node_modules/")) return;
-        let [filepath] = id2.split("?");
+        if (id.includes("/node_modules/")) return;
+        let [filepath] = id.split("?");
         let extensionsRE = /\.(jsx?|tsx?|mdx?)$/;
         if (!extensionsRE.test(filepath)) return;
         let devRuntime = "react/jsx-dev-runtime";
@@ -2270,13 +2285,10 @@ var reactRouterVitePlugin = () => {
         let isJSX = filepath.endsWith("x");
         let useFastRefresh = !ssr && (isJSX || code.includes(devRuntime));
         if (!useFastRefresh) return;
-        if (isRouteEntry(id2)) {
-          return { code: addRefreshWrapper(ctx.reactRouterConfig, code, id2) };
-        }
         let result = await babel.transformAsync(code, {
           babelrc: false,
           configFile: false,
-          filename: id2,
+          filename: id,
           sourceFileName: filepath,
           parserOpts: {
             sourceType: "module",
@@ -2289,18 +2301,18 @@ var reactRouterVitePlugin = () => {
         code = result.code;
         let refreshContentRE = /\$Refresh(?:Reg|Sig)\$\(/;
         if (refreshContentRE.test(code)) {
-          code = addRefreshWrapper(ctx.reactRouterConfig, code, id2);
+          code = addRefreshWrapper(ctx.reactRouterConfig, code, id);
         }
         return { code, map: result.map };
       }
     },
     {
-      name: "react-router-hmr-updates",
+      name: "react-router:hmr-updates",
       async handleHotUpdate({ server, file, modules, read }) {
         let route = getRoute(ctx.reactRouterConfig, file);
         let hmrEventData = { route: null };
         if (route) {
-          let serverManifest = (await server.ssrLoadModule(serverManifestId)).default;
+          let serverManifest = (await server.ssrLoadModule(virtual.serverManifest.id)).default;
           let oldRouteMetadata = serverManifest.routes[route.id];
           let newRouteMetadata = await getRouteMetadata(
             ctx,
@@ -2326,12 +2338,58 @@ var reactRouterVitePlugin = () => {
         });
         return modules;
       }
+    },
+    {
+      name: "react-router-server-change-trigger-client-hmr",
+      // This hook is only available in Vite v6+ so this is a no-op in v5.
+      // Previously the server and client modules were shared in a single module
+      // graph. This meant that changes to server code automatically resulted in
+      // client HMR updates. In Vite v6+ these module graphs are separate from
+      // each other so we need to manually trigger client HMR updates if server
+      // code has changed.
+      hotUpdate({ server, modules }) {
+        if (this.environment.name !== "ssr" && modules.length <= 0) {
+          return;
+        }
+        let clientModules = uniqueNodes(
+          modules.flatMap(
+            (mod) => getParentClientNodes(server.environments.client.moduleGraph, mod)
+          )
+        );
+        for (let clientModule of clientModules) {
+          server.environments.client.reloadModule(clientModule);
+        }
+      }
     }
   ];
 };
-function addRefreshWrapper(reactRouterConfig, code, id2) {
-  let route = getRoute(reactRouterConfig, id2);
-  let acceptExports = route || isRouteEntry(id2) ? [
+function getParentClientNodes(clientModuleGraph, module2) {
+  if (!module2.id) {
+    return [];
+  }
+  let clientModule = clientModuleGraph.getModuleById(module2.id);
+  if (clientModule) {
+    return [clientModule];
+  }
+  return [...module2.importers].flatMap(
+    (importer) => getParentClientNodes(clientModuleGraph, importer)
+  );
+}
+function uniqueNodes(nodes) {
+  let nodeUrls = /* @__PURE__ */ new Set();
+  let unique = [];
+  for (let node of nodes) {
+    if (nodeUrls.has(node.url)) {
+      continue;
+    }
+    nodeUrls.add(node.url);
+    unique.push(node);
+  }
+  return unique;
+}
+function addRefreshWrapper(reactRouterConfig, code, id) {
+  let route = getRoute(reactRouterConfig, id);
+  let acceptExports = route ? [
     "clientAction",
     "clientLoader",
     "handle",
@@ -2341,10 +2399,10 @@ function addRefreshWrapper(reactRouterConfig, code, id2) {
   ] : [];
   return "\n\n" + withCommentBoundaries(
     "REACT REFRESH HEADER",
-    REACT_REFRESH_HEADER.replaceAll("__SOURCE__", JSON.stringify(id2))
+    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(id2)).replaceAll("__ACCEPT_EXPORTS__", JSON.stringify(acceptExports)).replaceAll("__ROUTE_ID__", JSON.stringify(route?.id))
+    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) {
@@ -2357,7 +2415,7 @@ ${text}
 ${end}`;
 }
 var REACT_REFRESH_HEADER = `
-import RefreshRuntime from "${hmrRuntimeId}";
+import RefreshRuntime from "${virtualHmrRuntime.id}";
 
 const inWebWorker = typeof WorkerGlobalScope !== 'undefined' && self instanceof WorkerGlobalScope;
 let prevRefreshReg;
@@ -2443,7 +2501,7 @@ async function getPrerenderBuildAndHandler(viteConfig, reactRouterConfig, server
     serverBuildDirectory,
     reactRouterConfig.serverBuildFile
   );
-  let build = await import(url2.pathToFileURL(serverBuildPath).toString());
+  let build = await import(url.pathToFileURL(serverBuildPath).toString());
   let { createRequestHandler: createHandler } = await import("react-router");
   return {
     build,