@react-router/dev 0.0.0-experimental-1b454267f → 0.0.0-experimental-58439e382

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-1b454267f
+ * @react-router/dev v0.0.0-experimental-58439e382
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -516,7 +516,7 @@ function findEntry(dir, basename2, options) {
   }
   return void 0;
 }
-var import_node_fs, import_node_child_process, import_package_json, import_pathe3, import_chokidar, import_picocolors, import_pick2, import_omit, import_cloneDeep, import_isEqual, excludedConfigPresetKeys, branchRouteProperties, configRouteToBranchRoute, mergeReactRouterConfig, deepFreeze, ssrExternals, entryExts;
+var import_node_fs, import_node_child_process, import_package_json, import_pathe3, import_chokidar, import_picocolors, import_pick2, import_omit, import_cloneDeep, import_isEqual, excludedConfigPresetKeys, mergeReactRouterConfig, deepFreeze, ssrExternals, entryExts;
 var init_config = __esm({
   "config/config.ts"() {
     "use strict";
@@ -535,13 +535,6 @@ var init_config = __esm({
     init_detectPackageManager();
     init_is_react_router_repo();
     excludedConfigPresetKeys = ["presets"];
-    branchRouteProperties = [
-      "id",
-      "path",
-      "file",
-      "index"
-    ];
-    configRouteToBranchRoute = (configRoute) => (0, import_pick2.default)(configRoute, branchRouteProperties);
     mergeReactRouterConfig = (...configs) => {
       let reducer = (configA, configB) => {
         let mergeRequired = (key) => configA[key] !== void 0 && configB[key] !== void 0;
@@ -1068,68 +1061,22 @@ async function resolveViteConfig({
   }
   return viteConfig;
 }
-async function extractPluginContext(viteConfig) {
+function extractPluginContext(viteConfig) {
   return viteConfig["__reactRouterPluginContext"];
 }
 function isSeverBundleEnvironmentName(name) {
   return name.startsWith(SSR_BUNDLE_PREFIX);
 }
-function getServerEnvironmentEntries(record, buildManifest) {
+function getServerEnvironmentEntries(ctx, record) {
   return Object.entries(record).filter(
-    ([name]) => buildManifest.serverBundles ? isSeverBundleEnvironmentName(name) : name === "ssr"
+    ([name]) => ctx.buildManifest?.serverBundles ? isSeverBundleEnvironmentName(name) : name === "ssr"
   );
 }
-function getServerEnvironmentKeys(record, buildManifest) {
-  return getServerEnvironmentEntries(record, buildManifest).map(([key]) => key);
-}
-function getAddressableRoutes(routes2) {
-  let nonAddressableIds = /* @__PURE__ */ new Set();
-  for (let id in routes2) {
-    let route = routes2[id];
-    if (route.index) {
-      invariant(
-        route.parentId,
-        `Expected index route "${route.id}" to have "parentId" set`
-      );
-      nonAddressableIds.add(route.parentId);
-    }
-    if (typeof route.path !== "string" && !route.index) {
-      nonAddressableIds.add(id);
-    }
-  }
-  return Object.values(routes2).filter(
-    (route) => !nonAddressableIds.has(route.id)
-  );
-}
-function getRouteBranch(routes2, routeId) {
-  let branch = [];
-  let currentRouteId = routeId;
-  while (currentRouteId) {
-    let route = routes2[currentRouteId];
-    invariant(route, `Missing route for ${currentRouteId}`);
-    branch.push(route);
-    currentRouteId = route.parentId;
-  }
-  return branch.reverse();
-}
-function hasServerBundles(buildManifest) {
-  return Object.keys(buildManifest.serverBundles ?? {}).length > 0;
+function getServerEnvironmentKeys(ctx, record) {
+  return getServerEnvironmentEntries(ctx, record).map(([key]) => key);
 }
-function getRoutesByServerBundleId(buildManifest) {
-  if (!buildManifest.routeIdToServerBundleId) {
-    return {};
-  }
-  let routesByServerBundleId = {};
-  for (let [routeId, serverBundleId] of Object.entries(
-    buildManifest.routeIdToServerBundleId
-  )) {
-    routesByServerBundleId[serverBundleId] ??= {};
-    let branch = getRouteBranch(buildManifest.routes, routeId);
-    for (let route of branch) {
-      routesByServerBundleId[serverBundleId][route.id] = route;
-    }
-  }
-  return routesByServerBundleId;
+function getServerBundleIds(ctx) {
+  return ctx.buildManifest?.serverBundles ? Object.keys(ctx.buildManifest.serverBundles) : void 0;
 }
 async function cleanBuildDirectory(viteConfig, ctx) {
   let buildDirectory = ctx.reactRouterConfig.buildDirectory;
@@ -1164,65 +1111,6 @@ async function cleanViteManifests(environmentsOptions, ctx) {
     })
   );
 }
-async function getBuildManifest(ctx) {
-  let { routes: routes2, serverBundles, appDirectory } = ctx.reactRouterConfig;
-  if (!serverBundles) {
-    return { routes: routes2 };
-  }
-  let { normalizePath } = await import("vite");
-  let serverBuildDirectory = getServerBuildDirectory(ctx);
-  let resolvedAppDirectory = path7.resolve(ctx.rootDirectory, appDirectory);
-  let rootRelativeRoutes = Object.fromEntries(
-    Object.entries(routes2).map(([id, route]) => {
-      let filePath = path7.join(resolvedAppDirectory, route.file);
-      let rootRelativeFilePath = normalizePath(
-        path7.relative(ctx.rootDirectory, filePath)
-      );
-      return [id, { ...route, file: rootRelativeFilePath }];
-    })
-  );
-  let buildManifest = {
-    serverBundles: {},
-    routeIdToServerBundleId: {},
-    routes: rootRelativeRoutes
-  };
-  await Promise.all(
-    getAddressableRoutes(routes2).map(async (route) => {
-      let branch = getRouteBranch(routes2, route.id);
-      let serverBundleId = await serverBundles({
-        branch: branch.map(
-          (route2) => configRouteToBranchRoute({
-            ...route2,
-            // Ensure absolute paths are passed to the serverBundles function
-            file: path7.join(resolvedAppDirectory, route2.file)
-          })
-        )
-      });
-      if (typeof serverBundleId !== "string") {
-        throw new Error(`The "serverBundles" function must return a string`);
-      }
-      if (!/^[a-zA-Z0-9-_]+$/.test(serverBundleId)) {
-        throw new Error(
-          `The "serverBundles" function must only return strings containing alphanumeric characters, hyphens and underscores.`
-        );
-      }
-      buildManifest.routeIdToServerBundleId[route.id] = serverBundleId;
-      buildManifest.serverBundles[serverBundleId] ??= {
-        id: serverBundleId,
-        file: normalizePath(
-          path7.join(
-            path7.relative(
-              ctx.rootDirectory,
-              path7.join(serverBuildDirectory, serverBundleId)
-            ),
-            ctx.reactRouterConfig.serverBuildFile
-          )
-        )
-      };
-    })
-  );
-  return buildManifest;
-}
 function mergeEnvironmentOptions(base, ...overrides) {
   let vite2 = getVite();
   return overrides.reduce(
@@ -1230,7 +1118,7 @@ function mergeEnvironmentOptions(base, ...overrides) {
     base
   );
 }
-async function getEnvironmentOptionsResolvers(ctx, buildManifest, viteCommand) {
+async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
   let { serverBuildFile, serverModuleFormat } = ctx.reactRouterConfig;
   let packageRoot = path7.dirname(
     require.resolve("@react-router/dev/package.json")
@@ -1274,7 +1162,15 @@ async function getEnvironmentOptionsResolvers(ctx, buildManifest, viteCommand) {
     let conditions = viteCommand === "build" ? viteServerConditions : ["development", ...viteServerConditions];
     return mergeEnvironmentOptions(getBaseOptions({ viteUserConfig }), {
       resolve: {
-        external: ssrExternals,
+        external: (
+          // This check is required to honor the "noExternal: true" config
+          // provided by vite-plugin-cloudflare within this repo. When compiling
+          // for Cloudflare, all server dependencies are externalized, but our
+          // `ssrExternals` config inadvertently overrides this. This doesn't
+          // impact consumers because for them `ssrExternals` is undefined and
+          // Cloudflare's "noExternal: true" config remains intact.
+          ctx.reactRouterConfig.future.unstable_viteEnvironmentApi && viteUserConfig.environments?.ssr?.resolve?.noExternal === true ? void 0 : ssrExternals
+        ),
         conditions,
         externalConditions: conditions
       },
@@ -1288,6 +1184,7 @@ async function getEnvironmentOptionsResolvers(ctx, buildManifest, viteCommand) {
         copyPublicDir: false,
         // Assets in the public directory are only used by the client
         rollupOptions: {
+          input: (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig.environments?.ssr?.build?.rollupOptions?.input : viteUserConfig.build?.rollupOptions?.input) ?? virtual.serverBuild.id,
           output: {
             entryFileNames: serverBuildFile,
             format: serverModuleFormat
@@ -1319,12 +1216,15 @@ async function getEnvironmentOptionsResolvers(ctx, buildManifest, viteCommand) {
               }
             )
           ],
-          output: {
-            entryFileNames({ moduleIds }) {
+          output: (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig?.environments?.client?.build?.rollupOptions?.output : viteUserConfig?.build?.rollupOptions?.output) ?? {
+            entryFileNames: ({ moduleIds }) => {
               let routeChunkModuleId = moduleIds.find(isRouteChunkModuleId);
               let routeChunkName = routeChunkModuleId ? getRouteChunkNameFromModuleId(routeChunkModuleId) : null;
               let routeChunkSuffix = routeChunkName ? `-${(0, import_kebabCase.default)(routeChunkName)}` : "";
-              return `assets/[name]${routeChunkSuffix}-[hash].js`;
+              return path7.posix.join(
+                (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig?.environments?.client?.build?.assetsDir : viteUserConfig?.build?.assetsDir) ?? "assets",
+                `[name]${routeChunkSuffix}-[hash].js`
+              );
             }
           }
         },
@@ -1332,22 +1232,17 @@ async function getEnvironmentOptionsResolvers(ctx, buildManifest, viteCommand) {
       }
     })
   };
-  if (hasServerBundles(buildManifest)) {
-    for (let [serverBundleId, routes2] of Object.entries(
-      getRoutesByServerBundleId(buildManifest)
-    )) {
-      const serverBundleEnvironmentId = serverBundleId.replaceAll("-", "_");
-      const environmentName = `${SSR_BUNDLE_PREFIX}${serverBundleEnvironmentId}`;
+  let serverBundleIds = getServerBundleIds(ctx);
+  if (serverBundleIds) {
+    for (let serverBundleId of serverBundleIds) {
+      const environmentName = `${SSR_BUNDLE_PREFIX}${serverBundleId}`;
       environmentOptionsResolvers[environmentName] = ({ viteUserConfig }) => mergeEnvironmentOptions(
         getBaseServerOptions({ viteUserConfig }),
         {
           build: {
-            outDir: getServerBuildDirectory(ctx, { serverBundleId }),
-            rollupOptions: {
-              input: `${virtual.serverBuild.id}?route-ids=${Object.keys(
-                routes2
-              ).join(",")}`
-            }
+            outDir: getServerBuildDirectory(ctx.reactRouterConfig, {
+              serverBundleId
+            })
           }
         },
         // Ensure server bundle environments extend the user's SSR
@@ -1358,10 +1253,7 @@ async function getEnvironmentOptionsResolvers(ctx, buildManifest, viteCommand) {
   } else {
     environmentOptionsResolvers.ssr = ({ viteUserConfig }) => mergeEnvironmentOptions(getBaseServerOptions({ viteUserConfig }), {
       build: {
-        outDir: getServerBuildDirectory(ctx),
-        rollupOptions: {
-          input: (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig.environments?.ssr?.build?.rollupOptions?.input : viteUserConfig.build?.rollupOptions?.input) ?? virtual.serverBuild.id
-        }
+        outDir: getServerBuildDirectory(ctx.reactRouterConfig)
       },
       optimizeDeps: ctx.reactRouterConfig.future.unstable_viteEnvironmentApi && viteUserConfig.environments?.ssr?.optimizeDeps?.noDiscovery === false ? {
         entries: [
@@ -1440,8 +1332,8 @@ var init_plugin = __esm({
       serverManifest: create("server-manifest"),
       browserManifest: create("browser-manifest")
     };
-    getServerBuildDirectory = (ctx, { serverBundleId } = {}) => path7.join(
-      ctx.reactRouterConfig.buildDirectory,
+    getServerBuildDirectory = (reactRouterConfig, { serverBundleId } = {}) => path7.join(
+      reactRouterConfig.buildDirectory,
       "server",
       ...serverBundleId ? [serverBundleId] : []
     );
@@ -1585,7 +1477,7 @@ async function viteBuild(root, {
       }
     ]
   });
-  let ctx = await extractPluginContext(viteConfig);
+  let ctx = extractPluginContext(viteConfig);
   if (!ctx) {
     console.error(
       import_picocolors5.default.red("React Router Vite plugin not found in Vite config")
@@ -1615,14 +1507,16 @@ async function viteBuild(root, {
       optimizeDeps: { force },
       clearScreen,
       logLevel,
-      ...{ __reactRouterEnvironmentBuildContext: environmentBuildContext }
+      ...{
+        __reactRouterPluginContext: ctx,
+        __reactRouterEnvironmentBuildContext: environmentBuildContext
+      }
     });
   }
-  let { reactRouterConfig } = ctx;
-  let buildManifest = await getBuildManifest(ctx);
+  let { reactRouterConfig, buildManifest } = ctx;
+  invariant(buildManifest, "Expected build manifest to be present");
   let environmentOptionsResolvers = await getEnvironmentOptionsResolvers(
     ctx,
-    buildManifest,
     "build"
   );
   let environmentsOptions = resolveEnvironmentsOptions(
@@ -1632,8 +1526,8 @@ async function viteBuild(root, {
   await cleanBuildDirectory(viteConfig, ctx);
   await buildEnvironment("client");
   let serverEnvironmentNames = getServerEnvironmentKeys(
-    environmentOptionsResolvers,
-    buildManifest
+    ctx,
+    environmentOptionsResolvers
   );
   await Promise.all(serverEnvironmentNames.map(buildEnvironment));
   await cleanViteManifests(environmentsOptions, ctx);

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-1b454267f
+ * @react-router/dev v0.0.0-experimental-58439e382
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-1b454267f
+ * @react-router/dev v0.0.0-experimental-58439e382
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-1b454267f
+ * @react-router/dev v0.0.0-experimental-58439e382
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -64,7 +64,18 @@ function invariant(value, message) {
 }
 
 // vite/node-adapter.ts
-function fromNodeHeaders(nodeHeaders) {
+function fromNodeHeaders(nodeReq) {
+  let nodeHeaders = nodeReq.headers;
+  if (nodeReq.httpVersionMajor >= 2) {
+    nodeHeaders = { ...nodeHeaders };
+    if (nodeHeaders[":authority"]) {
+      nodeHeaders.host = nodeHeaders[":authority"];
+    }
+    delete nodeHeaders[":authority"];
+    delete nodeHeaders[":method"];
+    delete nodeHeaders[":path"];
+    delete nodeHeaders[":scheme"];
+  }
   let headers = new Headers();
   for (let [key, values] of Object.entries(nodeHeaders)) {
     if (values) {
@@ -89,7 +100,7 @@ function fromNodeRequest(nodeReq, nodeRes) {
   let controller = new AbortController();
   let init = {
     method: nodeReq.method,
-    headers: fromNodeHeaders(nodeReq.headers),
+    headers: fromNodeHeaders(nodeReq),
     signal: controller.signal
   };
   nodeRes.on("finish", () => controller = null);

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-1b454267f
+ * @react-router/dev v0.0.0-experimental-58439e382
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -867,7 +867,18 @@ var import_node_events = require("events");
 var import_node_stream = require("stream");
 var import_set_cookie_parser = require("set-cookie-parser");
 var import_node = require("@react-router/node");
-function fromNodeHeaders(nodeHeaders) {
+function fromNodeHeaders(nodeReq) {
+  let nodeHeaders = nodeReq.headers;
+  if (nodeReq.httpVersionMajor >= 2) {
+    nodeHeaders = { ...nodeHeaders };
+    if (nodeHeaders[":authority"]) {
+      nodeHeaders.host = nodeHeaders[":authority"];
+    }
+    delete nodeHeaders[":authority"];
+    delete nodeHeaders[":method"];
+    delete nodeHeaders[":path"];
+    delete nodeHeaders[":scheme"];
+  }
   let headers = new Headers();
   for (let [key, values] of Object.entries(nodeHeaders)) {
     if (values) {
@@ -892,7 +903,7 @@ function fromNodeRequest(nodeReq, nodeRes) {
   let controller = new AbortController();
   let init = {
     method: nodeReq.method,
-    headers: fromNodeHeaders(nodeReq.headers),
+    headers: fromNodeHeaders(nodeReq),
     signal: controller.signal
   };
   nodeRes.on("finish", () => controller = null);
@@ -1945,6 +1956,9 @@ function toFunctionExpression(decl) {
 }
 
 // vite/plugin.ts
+function extractPluginContext(viteConfig) {
+  return viteConfig["__reactRouterPluginContext"];
+}
 var SERVER_ONLY_ROUTE_EXPORTS = ["loader", "action", "headers"];
 var CLIENT_ROUTE_EXPORTS = [
   "clientAction",
@@ -1960,19 +1974,20 @@ var CLIENT_ROUTE_EXPORTS = [
 ];
 var BUILD_CLIENT_ROUTE_QUERY_STRING = "?__react-router-build-client-route";
 var SSR_BUNDLE_PREFIX = "ssrBundle_";
+function isSsrBundleEnvironmentName(name) {
+  return name.startsWith(SSR_BUNDLE_PREFIX);
+}
 var CSS_DEV_HELPER_ENVIRONMENT_NAME = "__react_router_css_dev_helper__";
 function isSeverBundleEnvironmentName(name) {
   return name.startsWith(SSR_BUNDLE_PREFIX);
 }
-function getServerEnvironmentEntries(record, buildManifest) {
+function getServerEnvironmentEntries(ctx, record) {
   return Object.entries(record).filter(
-    ([name]) => buildManifest.serverBundles ? isSeverBundleEnvironmentName(name) : name === "ssr"
+    ([name]) => ctx.buildManifest?.serverBundles ? isSeverBundleEnvironmentName(name) : name === "ssr"
   );
 }
-function getServerEnvironmentValues(record, buildManifest) {
-  return getServerEnvironmentEntries(record, buildManifest).map(
-    ([, value]) => value
-  );
+function getServerEnvironmentValues(ctx, record) {
+  return getServerEnvironmentEntries(ctx, record).map(([, value]) => value);
 }
 var isRouteEntryModuleId = (id) => {
   return id.endsWith(BUILD_CLIENT_ROUTE_QUERY_STRING);
@@ -1980,6 +1995,23 @@ var isRouteEntryModuleId = (id) => {
 var isRouteVirtualModule = (id) => {
   return isRouteEntryModuleId(id) || isRouteChunkModuleId(id);
 };
+var isServerBuildVirtualModuleId = (id) => {
+  return id.split("?")[0] === virtual.serverBuild.id;
+};
+var getServerBuildFile = (viteManifest) => {
+  let serverBuildIds = Object.keys(viteManifest).filter(
+    isServerBuildVirtualModuleId
+  );
+  invariant(
+    serverBuildIds.length <= 1,
+    "Multiple server build files found in manifest"
+  );
+  invariant(
+    serverBuildIds.length === 1,
+    "Server build file not found in manifest"
+  );
+  return viteManifest[serverBuildIds[0]].file;
+};
 var virtualHmrRuntime = create("hmr-runtime");
 var virtualInjectHmrRuntime = create("inject-hmr-runtime");
 var normalizeRelativeFilePath = (file, reactRouterConfig) => {
@@ -2146,12 +2178,29 @@ var resolveEnvironmentBuildContext = ({
   };
   return resolvedBuildContext;
 };
-var getServerBuildDirectory = (ctx, { serverBundleId } = {}) => path6.join(
-  ctx.reactRouterConfig.buildDirectory,
+var getServerBuildDirectory = (reactRouterConfig, { serverBundleId } = {}) => path6.join(
+  reactRouterConfig.buildDirectory,
   "server",
   ...serverBundleId ? [serverBundleId] : []
 );
 var getClientBuildDirectory = (reactRouterConfig) => path6.join(reactRouterConfig.buildDirectory, "client");
+var getServerBundleRouteIds = (vitePluginContext, ctx) => {
+  if (!ctx.buildManifest) {
+    return void 0;
+  }
+  let environmentName = ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? vitePluginContext.environment.name : ctx.environmentBuildContext?.name;
+  if (!environmentName || !isSsrBundleEnvironmentName(environmentName)) {
+    return void 0;
+  }
+  let serverBundleId = environmentName.replace(SSR_BUNDLE_PREFIX, "");
+  let routesByServerBundleId = getRoutesByServerBundleId(ctx.buildManifest);
+  let serverBundleRoutes = routesByServerBundleId[serverBundleId];
+  invariant(
+    serverBundleRoutes,
+    `Routes not found for server bundle "${serverBundleId}"`
+  );
+  return Object.keys(serverBundleRoutes);
+};
 var injectQuery = (url2, query) => url2.includes("?") ? url2.replace("?", `?${query}&`) : `${url2}?${query}`;
 var defaultEntriesDir = path6.resolve(
   path6.dirname(require.resolve("@react-router/dev/package.json")),
@@ -2168,7 +2217,6 @@ var reactRouterVitePlugin = () => {
   let viteUserConfig;
   let viteConfigEnv;
   let viteConfig;
-  let buildManifest;
   let cssModulesManifest = {};
   let viteChildCompiler = null;
   let cache = /* @__PURE__ */ new Map();
@@ -2189,6 +2237,7 @@ var reactRouterVitePlugin = () => {
       }
       return;
     }
+    let injectedPluginContext = !reactRouterConfig.future.unstable_viteEnvironmentApi && viteCommand === "build" ? extractPluginContext(viteUserConfig) : void 0;
     let { entryClientFilePath, entryServerFilePath } = await resolveEntryFiles({
       rootDirectory,
       reactRouterConfig
@@ -2203,6 +2252,7 @@ var reactRouterVitePlugin = () => {
       process.exit(1);
     }
     let viteManifestEnabled = viteUserConfig.build?.manifest === true;
+    let buildManifest = viteCommand === "build" ? injectedPluginContext?.buildManifest ?? await getBuildManifest({ reactRouterConfig, rootDirectory }) : null;
     let environmentBuildContext = viteCommand === "build" ? resolveEnvironmentBuildContext({ viteCommand, viteUserConfig }) : null;
     firstLoad = false;
     ctx = {
@@ -2212,7 +2262,8 @@ var reactRouterVitePlugin = () => {
       entryClientFilePath,
       entryServerFilePath,
       publicPath,
-      viteManifestEnabled
+      viteManifestEnabled,
+      buildManifest
     };
   };
   let pluginIndex = (pluginName) => {
@@ -2234,21 +2285,26 @@ var reactRouterVitePlugin = () => {
       ctx.reactRouterConfig.ssr,
       routes
     );
+    let isSpaMode = isSpaModeEnabled(ctx.reactRouterConfig);
     return `
-      import * as entryServer from ${JSON.stringify(
+    import * as entryServer from ${JSON.stringify(
       resolveFileUrl(ctx, ctx.entryServerFilePath)
     )};
-      ${Object.keys(routes).map((key, index) => {
+    ${Object.keys(routes).map((key, index) => {
       let route = routes[key];
-      return `import * as route${index} from ${JSON.stringify(
-        resolveFileUrl(
-          ctx,
-          resolveRelativeRouteFilePath(route, ctx.reactRouterConfig)
-        )
-      )};`;
+      if (isSpaMode && key !== "root") {
+        return `const route${index} = { default: () => null };`;
+      } else {
+        return `import * as route${index} from ${JSON.stringify(
+          resolveFileUrl(
+            ctx,
+            resolveRelativeRouteFilePath(route, ctx.reactRouterConfig)
+          )
+        )};`;
+      }
     }).join("\n")}
       export { default as assets } from ${JSON.stringify(
-      `${virtual.serverManifest.id}${routeIds ? `?route-ids=${routeIds.join(",")}` : ""}`
+      virtual.serverManifest.id
     )};
       export const assetsBuildDirectory = ${JSON.stringify(
       path6.relative(
@@ -2259,7 +2315,7 @@ var reactRouterVitePlugin = () => {
       export const basename = ${JSON.stringify(ctx.reactRouterConfig.basename)};
       export const future = ${JSON.stringify(ctx.reactRouterConfig.future)};
       export const ssr = ${ctx.reactRouterConfig.ssr};
-      export const isSpaMode = ${isSpaModeEnabled(ctx.reactRouterConfig)};
+      export const isSpaMode = ${isSpaMode};
       export const prerender = ${JSON.stringify(prerenderPaths)};
       export const publicPath = ${JSON.stringify(ctx.publicPath)};
       export const entry = { module: entryServer };
@@ -2553,7 +2609,6 @@ var reactRouterVitePlugin = () => {
           watch: viteCommand === "serve"
         });
         await updatePluginContext();
-        buildManifest = await getBuildManifest(ctx);
         Object.assign(
           process.env,
           vite2.loadEnv(
@@ -2565,15 +2620,12 @@ var reactRouterVitePlugin = () => {
             ""
           )
         );
-        let environments = await getEnvironmentsOptions(
-          ctx,
-          buildManifest,
-          viteCommand,
-          { viteUserConfig }
-        );
+        let environments = await getEnvironmentsOptions(ctx, viteCommand, {
+          viteUserConfig
+        });
         let serverEnvironment = getServerEnvironmentValues(
-          environments,
-          buildManifest
+          ctx,
+          environments
         )[0];
         invariant(serverEnvironment);
         let clientEnvironment = environments.client;
@@ -2644,7 +2696,6 @@ var reactRouterVitePlugin = () => {
               sharedPlugins: true,
               async buildApp(builder) {
                 invariant(viteConfig);
-                invariant(buildManifest);
                 viteConfig.logger.info(
                   "Using Vite Environment API (experimental)"
                 );
@@ -2652,11 +2703,13 @@ var reactRouterVitePlugin = () => {
                 await cleanBuildDirectory(viteConfig, ctx);
                 await builder.build(builder.environments.client);
                 let serverEnvironments = getServerEnvironmentValues(
-                  builder.environments,
-                  buildManifest
+                  ctx,
+                  builder.environments
                 );
                 await Promise.all(serverEnvironments.map(builder.build));
                 await cleanViteManifests(environments, ctx);
+                let { buildManifest } = ctx;
+                invariant(buildManifest, "Expected build manifest");
                 await reactRouterConfig.buildEnd?.({
                   buildManifest,
                   reactRouterConfig,
@@ -2840,9 +2893,21 @@ var reactRouterVitePlugin = () => {
           if (!viteDevServer.config.server.middlewareMode) {
             viteDevServer.middlewares.use(async (req, res, next) => {
               try {
-                let build = await viteDevServer.ssrLoadModule(
-                  virtual.serverBuild.id
-                );
+                let build;
+                if (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi) {
+                  let vite2 = getVite();
+                  let ssrEnvironment = viteDevServer.environments.ssr;
+                  if (!vite2.isRunnableDevEnvironment(ssrEnvironment)) {
+                    return;
+                  }
+                  build = await ssrEnvironment.runner.import(
+                    virtual.serverBuild.id
+                  );
+                } else {
+                  build = await viteDevServer.ssrLoadModule(
+                    virtual.serverBuild.id
+                  );
+                }
                 let handler = (0, import_react_router2.createRequestHandler)(build, "development");
                 let nodeHandler = async (nodeReq, nodeRes) => {
                   let req2 = fromNodeRequest(nodeReq, nodeRes);
@@ -2872,7 +2937,7 @@ var reactRouterVitePlugin = () => {
           let clientBuildDirectory = getClientBuildDirectory(
             ctx.reactRouterConfig
           );
-          let serverBuildDirectory = future.unstable_viteEnvironmentApi ? this.environment.config?.build?.outDir : ctx.environmentBuildContext?.options.build?.outDir ?? getServerBuildDirectory(ctx);
+          let serverBuildDirectory = future.unstable_viteEnvironmentApi ? this.environment.config?.build?.outDir : ctx.environmentBuildContext?.options.build?.outDir ?? getServerBuildDirectory(ctx.reactRouterConfig);
           let ssrViteManifest = await loadViteManifest(serverBuildDirectory);
           let ssrAssetPaths = getViteManifestAssetPaths(ssrViteManifest);
           let movedAssetPaths = [];
@@ -2911,7 +2976,7 @@ var reactRouterVitePlugin = () => {
               viteConfig,
               ctx.reactRouterConfig,
               serverBuildDirectory,
-              ssrViteManifest[virtual.serverBuild.id].file,
+              getServerBuildFile(ssrViteManifest),
               clientBuildDirectory
             );
           }
@@ -2920,7 +2985,7 @@ var reactRouterVitePlugin = () => {
               viteConfig,
               ctx.reactRouterConfig,
               serverBuildDirectory,
-              ssrViteManifest[virtual.serverBuild.id].file,
+              getServerBuildFile(ssrViteManifest),
               clientBuildDirectory
             );
           }
@@ -3061,22 +3126,17 @@ var reactRouterVitePlugin = () => {
       name: "react-router:virtual-modules",
       enforce: "pre",
       resolveId(id) {
-        let [baseId, queryString] = id.split("?");
-        const vmod2 = Object.values(virtual).find((vmod3) => vmod3.id === baseId);
-        if (vmod2)
-          return vmod2.resolvedId + (queryString ? `?${queryString}` : "");
+        const vmod2 = Object.values(virtual).find((vmod3) => vmod3.id === id);
+        if (vmod2) return vmod2.resolvedId;
       },
       async load(id) {
-        let [baseId, queryString] = id.split("?");
-        switch (baseId) {
+        switch (id) {
           case virtual.serverBuild.resolvedId: {
-            let searchParams = new URLSearchParams(queryString);
-            let routeIds = searchParams.get("route-ids")?.split(",") || void 0;
+            let routeIds = getServerBundleRouteIds(this, ctx);
             return await getServerEntry({ routeIds });
           }
           case virtual.serverManifest.resolvedId: {
-            let searchParams = new URLSearchParams(queryString);
-            let routeIds = searchParams.get("route-ids")?.split(",") || void 0;
+            let routeIds = getServerBundleRouteIds(this, ctx);
             let reactRouterManifest = viteCommand === "build" ? (await generateReactRouterManifestsForBuild({
               routeIds
             })).reactRouterServerManifest : await getReactRouterManifestForDev();
@@ -3563,18 +3623,26 @@ async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirecto
     serverBuildDirectory,
     serverBuildPath
   );
-  let routes = createPrerenderRoutes(build.routes);
+  let routes = createPrerenderRoutes(reactRouterConfig.routes);
+  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: ${path7}`
+      );
+    }
+  }
+  let buildRoutes = createPrerenderRoutes(build.routes);
   let headers = {
     // Header that can be used in the loader to know if you're running at
     // build time or runtime
     "X-React-Router-Prerender": "yes"
   };
   for (let path7 of build.prerender) {
-    let matches = (0, import_react_router2.matchRoutes)(routes, `/${path7}/`.replace(/^\/\/+/, "/"));
-    invariant(
-      matches,
-      `Unable to prerender path because it does not match any routes: ${path7}`
-    );
+    let matches = (0, import_react_router2.matchRoutes)(buildRoutes, `/${path7}/`.replace(/^\/\/+/, "/"));
+    if (!matches) {
+      continue;
+    }
     let leafRoute = matches ? matches[matches.length - 1].route : null;
     let manifestRoute = leafRoute ? build.routes[leafRoute.id]?.module : null;
     let isResourceRoute = manifestRoute && !manifestRoute.default && !manifestRoute.ErrorBoundary;
@@ -3877,8 +3945,8 @@ function getRouteBranch(routes, routeId) {
   }
   return branch.reverse();
 }
-function hasServerBundles(buildManifest) {
-  return Object.keys(buildManifest.serverBundles ?? {}).length > 0;
+function getServerBundleIds(ctx) {
+  return ctx.buildManifest?.serverBundles ? Object.keys(ctx.buildManifest.serverBundles) : void 0;
 }
 function getRoutesByServerBundleId(buildManifest) {
   if (!buildManifest.routeIdToServerBundleId) {
@@ -3993,19 +4061,22 @@ async function cleanViteManifests(environmentsOptions, ctx) {
     })
   );
 }
-async function getBuildManifest(ctx) {
-  let { routes, serverBundles, appDirectory } = ctx.reactRouterConfig;
+async function getBuildManifest({
+  reactRouterConfig,
+  rootDirectory
+}) {
+  let { routes, serverBundles, appDirectory } = reactRouterConfig;
   if (!serverBundles) {
     return { routes };
   }
   let { normalizePath } = await import("vite");
-  let serverBuildDirectory = getServerBuildDirectory(ctx);
-  let resolvedAppDirectory = path6.resolve(ctx.rootDirectory, appDirectory);
+  let serverBuildDirectory = getServerBuildDirectory(reactRouterConfig);
+  let resolvedAppDirectory = path6.resolve(rootDirectory, appDirectory);
   let rootRelativeRoutes = Object.fromEntries(
     Object.entries(routes).map(([id, route]) => {
       let filePath = path6.join(resolvedAppDirectory, route.file);
       let rootRelativeFilePath = normalizePath(
-        path6.relative(ctx.rootDirectory, filePath)
+        path6.relative(rootDirectory, filePath)
       );
       return [id, { ...route, file: rootRelativeFilePath }];
     })
@@ -4030,10 +4101,18 @@ async function getBuildManifest(ctx) {
       if (typeof serverBundleId !== "string") {
         throw new Error(`The "serverBundles" function must return a string`);
       }
-      if (!/^[a-zA-Z0-9-_]+$/.test(serverBundleId)) {
-        throw new Error(
-          `The "serverBundles" function must only return strings containing alphanumeric characters, hyphens and underscores.`
-        );
+      if (reactRouterConfig.future.unstable_viteEnvironmentApi) {
+        if (!/^[a-zA-Z0-9_]+$/.test(serverBundleId)) {
+          throw new Error(
+            `The "serverBundles" function must only return strings containing alphanumeric characters and underscores.`
+          );
+        }
+      } else {
+        if (!/^[a-zA-Z0-9-_]+$/.test(serverBundleId)) {
+          throw new Error(
+            `The "serverBundles" function must only return strings containing alphanumeric characters, hyphens and underscores.`
+          );
+        }
       }
       buildManifest.routeIdToServerBundleId[route.id] = serverBundleId;
       buildManifest.serverBundles[serverBundleId] ??= {
@@ -4041,10 +4120,10 @@ async function getBuildManifest(ctx) {
         file: normalizePath(
           path6.join(
             path6.relative(
-              ctx.rootDirectory,
+              rootDirectory,
               path6.join(serverBuildDirectory, serverBundleId)
             ),
-            ctx.reactRouterConfig.serverBuildFile
+            reactRouterConfig.serverBuildFile
           )
         )
       };
@@ -4059,7 +4138,7 @@ function mergeEnvironmentOptions(base, ...overrides) {
     base
   );
 }
-async function getEnvironmentOptionsResolvers(ctx, buildManifest, viteCommand) {
+async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
   let { serverBuildFile, serverModuleFormat } = ctx.reactRouterConfig;
   let packageRoot = path6.dirname(
     require.resolve("@react-router/dev/package.json")
@@ -4103,7 +4182,15 @@ async function getEnvironmentOptionsResolvers(ctx, buildManifest, viteCommand) {
     let conditions = viteCommand === "build" ? viteServerConditions : ["development", ...viteServerConditions];
     return mergeEnvironmentOptions(getBaseOptions({ viteUserConfig }), {
       resolve: {
-        external: ssrExternals,
+        external: (
+          // This check is required to honor the "noExternal: true" config
+          // provided by vite-plugin-cloudflare within this repo. When compiling
+          // for Cloudflare, all server dependencies are externalized, but our
+          // `ssrExternals` config inadvertently overrides this. This doesn't
+          // impact consumers because for them `ssrExternals` is undefined and
+          // Cloudflare's "noExternal: true" config remains intact.
+          ctx.reactRouterConfig.future.unstable_viteEnvironmentApi && viteUserConfig.environments?.ssr?.resolve?.noExternal === true ? void 0 : ssrExternals
+        ),
         conditions,
         externalConditions: conditions
       },
@@ -4117,6 +4204,7 @@ async function getEnvironmentOptionsResolvers(ctx, buildManifest, viteCommand) {
         copyPublicDir: false,
         // Assets in the public directory are only used by the client
         rollupOptions: {
+          input: (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig.environments?.ssr?.build?.rollupOptions?.input : viteUserConfig.build?.rollupOptions?.input) ?? virtual.serverBuild.id,
           output: {
             entryFileNames: serverBuildFile,
             format: serverModuleFormat
@@ -4148,12 +4236,15 @@ async function getEnvironmentOptionsResolvers(ctx, buildManifest, viteCommand) {
               }
             )
           ],
-          output: {
-            entryFileNames({ moduleIds }) {
+          output: (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig?.environments?.client?.build?.rollupOptions?.output : viteUserConfig?.build?.rollupOptions?.output) ?? {
+            entryFileNames: ({ moduleIds }) => {
               let routeChunkModuleId = moduleIds.find(isRouteChunkModuleId);
               let routeChunkName = routeChunkModuleId ? getRouteChunkNameFromModuleId(routeChunkModuleId) : null;
               let routeChunkSuffix = routeChunkName ? `-${(0, import_kebabCase.default)(routeChunkName)}` : "";
-              return `assets/[name]${routeChunkSuffix}-[hash].js`;
+              return path6.posix.join(
+                (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig?.environments?.client?.build?.assetsDir : viteUserConfig?.build?.assetsDir) ?? "assets",
+                `[name]${routeChunkSuffix}-[hash].js`
+              );
             }
           }
         },
@@ -4161,22 +4252,17 @@ async function getEnvironmentOptionsResolvers(ctx, buildManifest, viteCommand) {
       }
     })
   };
-  if (hasServerBundles(buildManifest)) {
-    for (let [serverBundleId, routes] of Object.entries(
-      getRoutesByServerBundleId(buildManifest)
-    )) {
-      const serverBundleEnvironmentId = serverBundleId.replaceAll("-", "_");
-      const environmentName = `${SSR_BUNDLE_PREFIX}${serverBundleEnvironmentId}`;
+  let serverBundleIds = getServerBundleIds(ctx);
+  if (serverBundleIds) {
+    for (let serverBundleId of serverBundleIds) {
+      const environmentName = `${SSR_BUNDLE_PREFIX}${serverBundleId}`;
       environmentOptionsResolvers[environmentName] = ({ viteUserConfig }) => mergeEnvironmentOptions(
         getBaseServerOptions({ viteUserConfig }),
         {
           build: {
-            outDir: getServerBuildDirectory(ctx, { serverBundleId }),
-            rollupOptions: {
-              input: `${virtual.serverBuild.id}?route-ids=${Object.keys(
-                routes
-              ).join(",")}`
-            }
+            outDir: getServerBuildDirectory(ctx.reactRouterConfig, {
+              serverBundleId
+            })
           }
         },
         // Ensure server bundle environments extend the user's SSR
@@ -4187,10 +4273,7 @@ async function getEnvironmentOptionsResolvers(ctx, buildManifest, viteCommand) {
   } else {
     environmentOptionsResolvers.ssr = ({ viteUserConfig }) => mergeEnvironmentOptions(getBaseServerOptions({ viteUserConfig }), {
       build: {
-        outDir: getServerBuildDirectory(ctx),
-        rollupOptions: {
-          input: (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig.environments?.ssr?.build?.rollupOptions?.input : viteUserConfig.build?.rollupOptions?.input) ?? virtual.serverBuild.id
-        }
+        outDir: getServerBuildDirectory(ctx.reactRouterConfig)
       },
       optimizeDeps: ctx.reactRouterConfig.future.unstable_viteEnvironmentApi && viteUserConfig.environments?.ssr?.optimizeDeps?.noDiscovery === false ? {
         entries: [
@@ -4222,10 +4305,9 @@ function resolveEnvironmentsOptions(environmentResolvers, resolverOptions) {
   }
   return environmentOptions;
 }
-async function getEnvironmentsOptions(ctx, buildManifest, viteCommand, resolverOptions) {
+async function getEnvironmentsOptions(ctx, viteCommand, resolverOptions) {
   let environmentOptionsResolvers = await getEnvironmentOptionsResolvers(
     ctx,
-    buildManifest,
     viteCommand
   );
   return resolveEnvironmentsOptions(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-1b454267f",
+  "version": "0.0.0-experimental-58439e382",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -88,7 +88,7 @@
     "set-cookie-parser": "^2.6.0",
     "valibot": "^0.41.0",
     "vite-node": "3.0.0-beta.2",
-    "@react-router/node": "0.0.0-experimental-1b454267f"
+    "@react-router/node": "0.0.0-experimental-58439e382"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -114,18 +114,18 @@
     "tiny-invariant": "^1.2.0",
     "tsup": "^8.3.0",
     "typescript": "^5.1.6",
-    "vite": "^6.0.0",
+    "vite": "^6.1.0",
     "wireit": "0.14.9",
-    "wrangler": "^3.28.2",
-    "@react-router/serve": "0.0.0-experimental-1b454267f",
-    "react-router": "^0.0.0-experimental-1b454267f"
+    "wrangler": "^3.109.2",
+    "@react-router/serve": "0.0.0-experimental-58439e382",
+    "react-router": "^0.0.0-experimental-58439e382"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0 || ^6.0.0",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "^0.0.0-experimental-1b454267f",
-    "react-router": "^0.0.0-experimental-1b454267f"
+    "@react-router/serve": "^0.0.0-experimental-58439e382",
+    "react-router": "^0.0.0-experimental-58439e382"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {