@react-router/dev 0.0.0-experimental-66d5af831 → 0.0.0-experimental-1ab091485

package/CHANGELOG.md

@@ -1,5 +1,91 @@
 # `@react-router/dev`
 
+## 7.2.0
+
+### Minor Changes
+
+- Generate a "SPA fallback" HTML file for scenarios where applications are prerendering the `/` route with `ssr:false` ([#12948](https://github.com/remix-run/react-router/pull/12948))
+
+  - If you specify `ssr:false` without a `prerender` config, this is considered "SPA Mode" and the generated `index.html` file will only render down to the root route and will be able to hydrate for any valid application path
+  - If you specify `ssr:false` with a `prerender` config but _do not_ include the `/` path (i.e., `prerender: ['/blog/post']`), then we still generate a "SPA Mode" `index.html` file that can hydrate for any path in the application
+  - However, previously if you specified `ssr:false` and included the `/` path in your `prerender` config, we would prerender the `/` route into `index.html` as a non-SPA page
+    - The generated HTML would include the root index route which prevented hydration for any other paths
+    - With this change, we now generate a "SPA Mode" file in `__spa-fallback.html` that will allow you to hydrate for any non-prerendered paths
+    - You can serve this file from your static file server for any paths that would otherwise 404 if you only want to pre-render _some_ routes in your `ssr:false` app and serve the others as a SPA
+    - `npx sirv-cli build/client --single __spa-fallback.html`
+
+- Allow a `loader` in the root route in SPA mode because it can be called/server-rendered at build time ([#12948](https://github.com/remix-run/react-router/pull/12948))
+
+  - `Route.HydrateFallbackProps` now also receives `loaderData`
+    - This will be defined so long as the `HydrateFallback` is rendering while _children_ routes are loading
+    - This will be `undefined` if the `HydrateFallback` is rendering because the route has it's own hydrating `clientLoader`
+    - In SPA mode, this will allow you to render loader root data into the SPA `index.html`
+
+- New type-safe `href` utility that guarantees links point to actual paths in your app ([#13012](https://github.com/remix-run/react-router/pull/13012))
+
+  ```tsx
+  import { href } from "react-router";
+
+  export default function Component() {
+    const link = href("/blog/:slug", { slug: "my-first-post" });
+    return (
+      <main>
+        <Link to={href("/products/:id", { id: "asdf" })} />
+        <NavLink to={href("/:lang?/about", { lang: "en" })} />
+      </main>
+    );
+  }
+  ```
+
+### Patch Changes
+
+- Handle custom `envDir` in Vite config ([#12969](https://github.com/remix-run/react-router/pull/12969))
+
+- Fix typegen for repeated params ([#13012](https://github.com/remix-run/react-router/pull/13012))
+
+  In React Router, path parameters are keyed by their name.
+  So for a path pattern like `/a/:id/b/:id?/c/:id`, the last `:id` will set the value for `id` in `useParams` and the `params` prop.
+  For example, `/a/1/b/2/c/3` will result in the value `{ id: 3 }` at runtime.
+
+  Previously, generated types for params incorrectly modeled repeated params with an array.
+  So `/a/1/b/2/c/3` generated a type like `{ id: [1,2,3] }`.
+
+  To be consistent with runtime behavior, the generated types now correctly model the "last one wins" semantics of path parameters.
+  So `/a/1/b/2/c/3` now generates a type like `{ id: 3 }`.
+
+- Fix CLI parsing to allow argumentless `npx react-router` usage ([#12925](https://github.com/remix-run/react-router/pull/12925))
+
+- Fix `ArgError: unknown or unexpected option: --version` when running `react-router --version` ([#13012](https://github.com/remix-run/react-router/pull/13012))
+
+- Skip action-only resource routes when using `prerender:true` ([#13004](https://github.com/remix-run/react-router/pull/13004))
+
+- Enhance invalid export detection when using `ssr:false` ([#12948](https://github.com/remix-run/react-router/pull/12948))
+
+  - `headers`/`action` are prohibited in all routes with `ssr:false` because there will be no runtime server on which to run them
+  - `loader` functions are more nuanced and depend on whether a given route is prerendered
+    - When using `ssr:false` without a `prerender` config, only the `root` route can have a `loader`
+      - This is "SPA mode" which generates a single `index.html` file with the root route `HydrateFallback` so it is capable of hydrating for any path in your application - therefore we can only call a root route `loader` at build time
+    - When using `ssr:false` with a `prerender` config, you can export a `loader` from routes matched by one of the `prerender` paths because those routes will be server rendered at build time
+      - Exporting a `loader` from a route that is never matched by a `prerender` path will throw a build time error because there will be no runtime server to ever run the loader
+
+- Limit prerendered resource route `.data` files to only the target route ([#13004](https://github.com/remix-run/react-router/pull/13004))
+
+- Add unstable support for splitting route modules in framework mode via `future.unstable_splitRouteModules` ([#11871](https://github.com/remix-run/react-router/pull/11871))
+
+- Fix prerendering of binary files ([#13039](https://github.com/remix-run/react-router/pull/13039))
+
+- Add `future.unstable_viteEnvironmentApi` flag to enable experimental Vite Environment API support ([#12936](https://github.com/remix-run/react-router/pull/12936))
+
+- Disable Lazy Route Discovery for all `ssr:false` apps and not just "SPA Mode" because there is no runtime server to serve the search-param-configured `__manifest` requests ([#12894](https://github.com/remix-run/react-router/pull/12894))
+
+  - We previously only disabled this for "SPA Mode" which is `ssr:false` and no `prerender` config but we realized it should apply to all `ssr:false` apps, including those prerendering multiple pages
+  - In those `prerender` scenarios we would prerender the `/__manifest` file assuming the static file server would serve it but that makes some unneccesary assumptions about the static file server behaviors
+
+- Updated dependencies:
+  - `react-router@7.2.0`
+  - `@react-router/node@7.2.0`
+  - `@react-router/serve@7.2.0`
+
 ## 7.1.5
 
 ### Patch Changes

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-66d5af831
+ * @react-router/dev v0.0.0-experimental-1ab091485
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -389,7 +389,6 @@ async function resolveConfig({
     );
   }
   let future = {
-    turboV3: reactRouterUserConfig.future?.turboV3 ?? false,
     unstable_optimizeDeps: reactRouterUserConfig.future?.unstable_optimizeDeps ?? false,
     unstable_splitRouteModules: reactRouterUserConfig.future?.unstable_splitRouteModules ?? false,
     unstable_viteEnvironmentApi: reactRouterUserConfig.future?.unstable_viteEnvironmentApi ?? false
@@ -945,7 +944,6 @@ var init_styles = __esm({
     path6 = __toESM(require("path"));
     import_react_router = require("react-router");
     init_resolve_file_url();
-    init_vite();
     cssFileRegExp = /\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/;
     cssModulesRegExp = new RegExp(`\\.module${cssFileRegExp.source}`);
   }
@@ -1364,9 +1362,26 @@ async function getEnvironmentOptionsResolvers(ctx, buildManifest, viteCommand) {
         rollupOptions: {
           input: (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig.environments?.ssr?.build?.rollupOptions?.input : viteUserConfig.build?.rollupOptions?.input) ?? virtual.serverBuild.id
         }
-      }
+      },
+      optimizeDeps: ctx.reactRouterConfig.future.unstable_viteEnvironmentApi && viteUserConfig.environments?.ssr?.optimizeDeps?.noDiscovery === false ? {
+        entries: [
+          vite2.normalizePath(ctx.entryServerFilePath),
+          ...Object.values(ctx.reactRouterConfig.routes).map(
+            (route) => resolveRelativeRouteFilePath(route, ctx.reactRouterConfig)
+          )
+        ],
+        include: [
+          "react",
+          "react/jsx-dev-runtime",
+          "react-dom/server",
+          "react-router"
+        ]
+      } : void 0
     });
   }
+  if (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi && viteCommand === "serve") {
+    environmentOptionsResolvers[CSS_DEV_HELPER_ENVIRONMENT_NAME] = () => ({});
+  }
   return environmentOptionsResolvers;
 }
 function resolveEnvironmentsOptions(environmentResolvers, resolverOptions) {
@@ -1381,7 +1396,7 @@ function resolveEnvironmentsOptions(environmentResolvers, resolverOptions) {
 function isNonNullable(x) {
   return x != null;
 }
-var import_node_crypto, path7, url, fse, babel2, import_react_router2, import_es_module_lexer, import_pick3, import_jsesc, import_picocolors4, import_kebabCase, BUILD_CLIENT_ROUTE_QUERY_STRING, SSR_BUNDLE_PREFIX, virtualHmrRuntime, virtualInjectHmrRuntime, virtual, getServerBuildDirectory, getClientBuildDirectory, defaultEntriesDir, defaultEntries, REACT_REFRESH_HEADER;
+var import_node_crypto, path7, url, fse, babel2, import_react_router2, import_es_module_lexer, import_pick3, import_jsesc, import_picocolors4, import_kebabCase, BUILD_CLIENT_ROUTE_QUERY_STRING, SSR_BUNDLE_PREFIX, CSS_DEV_HELPER_ENVIRONMENT_NAME, virtualHmrRuntime, virtualInjectHmrRuntime, resolveRelativeRouteFilePath, virtual, getServerBuildDirectory, getClientBuildDirectory, defaultEntriesDir, defaultEntries, REACT_REFRESH_HEADER;
 var init_plugin = __esm({
   "vite/plugin.ts"() {
     "use strict";
@@ -1411,8 +1426,15 @@ var init_plugin = __esm({
     init_with_props();
     BUILD_CLIENT_ROUTE_QUERY_STRING = "?__react-router-build-client-route";
     SSR_BUNDLE_PREFIX = "ssrBundle_";
+    CSS_DEV_HELPER_ENVIRONMENT_NAME = "__react_router_css_dev_helper__";
     virtualHmrRuntime = create("hmr-runtime");
     virtualInjectHmrRuntime = create("inject-hmr-runtime");
+    resolveRelativeRouteFilePath = (route, reactRouterConfig) => {
+      let vite2 = getVite();
+      let file = route.file;
+      let fullPath = path7.resolve(reactRouterConfig.appDirectory, file);
+      return vite2.normalizePath(fullPath);
+    };
     virtual = {
       serverBuild: create("server-build"),
       serverManifest: create("server-manifest"),

package/dist/config.d.ts

@@ -37,7 +37,6 @@ type ServerBundlesBuildManifest = BaseBuildManifest & {
 };
 type ServerModuleFormat = "esm" | "cjs";
 interface FutureConfig {
-    turboV3: boolean;
     unstable_optimizeDeps: boolean;
     /**
      * Automatically split route modules into multiple chunks when possible.

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-66d5af831
+ * @react-router/dev v0.0.0-experimental-1ab091485
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-66d5af831
+ * @react-router/dev v0.0.0-experimental-1ab091485
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-66d5af831
+ * @react-router/dev v0.0.0-experimental-1ab091485
  *
  * 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);
@@ -477,7 +488,6 @@ async function resolveConfig({
     );
   }
   let future = {
-    turboV3: reactRouterUserConfig.future?.turboV3 ?? false,
     unstable_optimizeDeps: reactRouterUserConfig.future?.unstable_optimizeDeps ?? false,
     unstable_splitRouteModules: reactRouterUserConfig.future?.unstable_splitRouteModules ?? false,
     unstable_viteEnvironmentApi: reactRouterUserConfig.future?.unstable_viteEnvironmentApi ?? false

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-66d5af831
+ * @react-router/dev v0.0.0-experimental-1ab091485
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -453,7 +453,6 @@ async function resolveConfig({
     );
   }
   let future = {
-    turboV3: reactRouterUserConfig.future?.turboV3 ?? false,
     unstable_optimizeDeps: reactRouterUserConfig.future?.unstable_optimizeDeps ?? false,
     unstable_splitRouteModules: reactRouterUserConfig.future?.unstable_splitRouteModules ?? false,
     unstable_viteEnvironmentApi: reactRouterUserConfig.future?.unstable_viteEnvironmentApi ?? false
@@ -868,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) {
@@ -893,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);
@@ -964,15 +974,12 @@ var isCssUrlWithoutSideEffects = (url2) => {
   }
   return false;
 };
-var injectQuery = (url2, query) => url2.includes("?") ? url2.replace("?", `?${query}&`) : `${url2}?${query}`;
 var getStylesForFiles = async ({
   viteDevServer,
   rootDirectory,
-  cssModulesManifest,
+  loadCssContents,
   files
 }) => {
-  let vite2 = getVite();
-  let viteMajor = parseInt(vite2.version.split(".")[0], 10);
   let styles = {};
   let deps = /* @__PURE__ */ new Set();
   try {
@@ -1001,21 +1008,9 @@ 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(
-          // 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();
-        }
-        styles[dep.url] = css;
+        styles[dep.url] = await loadCssContents(viteDevServer, dep);
       } catch {
-        console.warn(`Could not load ${dep.file}`);
+        console.warn(`Failed to load CSS for ${dep.file}`);
       }
     }
   }
@@ -1074,7 +1069,7 @@ var getStylesForUrl = async ({
   rootDirectory,
   reactRouterConfig,
   entryClientFilePath,
-  cssModulesManifest,
+  loadCssContents,
   build,
   url: url2
 }) => {
@@ -1089,7 +1084,7 @@ var getStylesForUrl = async ({
   let styles = await getStylesForFiles({
     viteDevServer,
     rootDirectory,
-    cssModulesManifest,
+    loadCssContents,
     files: [
       // Always include the client entry file when crawling the module graph for CSS
       path5.relative(rootDirectory, entryClientFilePath),
@@ -1968,6 +1963,7 @@ var CLIENT_ROUTE_EXPORTS = [
 ];
 var BUILD_CLIENT_ROUTE_QUERY_STRING = "?__react-router-build-client-route";
 var SSR_BUNDLE_PREFIX = "ssrBundle_";
+var CSS_DEV_HELPER_ENVIRONMENT_NAME = "__react_router_css_dev_helper__";
 function isSeverBundleEnvironmentName(name) {
   return name.startsWith(SSR_BUNDLE_PREFIX);
 }
@@ -2159,6 +2155,7 @@ var getServerBuildDirectory = (ctx, { serverBundleId } = {}) => path6.join(
   ...serverBundleId ? [serverBundleId] : []
 );
 var getClientBuildDirectory = (reactRouterConfig) => path6.join(reactRouterConfig.buildDirectory, "client");
+var injectQuery = (url2, query) => url2.includes("?") ? url2.replace("?", `?${query}&`) : `${url2}?${query}`;
 var defaultEntriesDir = path6.resolve(
   path6.dirname(require.resolve("@react-router/dev/package.json")),
   "dist",
@@ -2415,6 +2412,7 @@ var reactRouterVitePlugin = () => {
       reactRouterServerManifest
     };
   };
+  let currentReactRouterManifestForDev = null;
   let getReactRouterManifestForDev = async () => {
     let routes = {};
     let routeManifestExports = await getRouteManifestModuleExports(
@@ -2471,7 +2469,7 @@ var reactRouterVitePlugin = () => {
         imports: []
       };
     }
-    return {
+    let reactRouterManifestForDev = {
       version: String(Math.random()),
       url: combineURLs(ctx.publicPath, virtual.browserManifest.url),
       hmr: {
@@ -2486,6 +2484,42 @@ var reactRouterVitePlugin = () => {
       },
       routes
     };
+    currentReactRouterManifestForDev = reactRouterManifestForDev;
+    return reactRouterManifestForDev;
+  };
+  const loadCssContents = async (viteDevServer, dep) => {
+    invariant(
+      viteCommand === "serve",
+      "loadCssContents is only available in dev mode"
+    );
+    if (dep.file && isCssModulesFile(dep.file)) {
+      return cssModulesManifest[dep.file];
+    }
+    const vite2 = getVite();
+    const viteMajor = parseInt(vite2.version.split(".")[0], 10);
+    const url2 = viteMajor >= 6 ? (
+      // 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.
+      injectQuery(dep.url, "inline")
+    ) : dep.url;
+    let cssMod;
+    if (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi) {
+      const cssDevHelperEnvironment = viteDevServer.environments[CSS_DEV_HELPER_ENVIRONMENT_NAME];
+      invariant(cssDevHelperEnvironment, "Missing CSS dev helper environment");
+      invariant(vite2.isRunnableDevEnvironment(cssDevHelperEnvironment));
+      cssMod = await cssDevHelperEnvironment.runner.import(url2);
+    } else {
+      cssMod = await viteDevServer.ssrLoadModule(url2);
+    }
+    invariant(
+      typeof cssMod === "object" && cssMod !== null && "default" in cssMod && typeof cssMod.default === "string",
+      `Failed to load CSS for ${dep.file ?? dep.url}`
+    );
+    return cssMod.default;
   };
   return [
     {
@@ -2664,6 +2698,8 @@ var reactRouterVitePlugin = () => {
         }
         viteChildCompiler = await vite2.createServer({
           ...viteUserConfig,
+          // Ensure child compiler cannot overwrite the default cache directory
+          cacheDir: "node_modules/.vite-child-compiler",
           mode: viteConfig.mode,
           server: {
             watch: viteConfig.command === "build" ? null : void 0,
@@ -2675,7 +2711,23 @@ var reactRouterVitePlugin = () => {
           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"
-            )
+            ),
+            {
+              name: "react-router:override-optimize-deps",
+              config(userConfig) {
+                if (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi && userConfig.environments) {
+                  for (const environmentName of Object.keys(
+                    userConfig.environments
+                  )) {
+                    userConfig.environments[environmentName].optimizeDeps = {
+                      noDiscovery: true
+                    };
+                  }
+                } else {
+                  userConfig.optimizeDeps = { noDiscovery: true };
+                }
+              }
+            }
           ]
         });
         await viteChildCompiler.pluginContainer.buildStart({});
@@ -2712,7 +2764,7 @@ var reactRouterVitePlugin = () => {
               entryClientFilePath: ctx.entryClientFilePath,
               reactRouterConfig: ctx.reactRouterConfig,
               viteDevServer,
-              cssModulesManifest,
+              loadCssContents,
               build,
               url: url2
             });
@@ -2761,9 +2813,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);
@@ -3232,8 +3296,7 @@ var reactRouterVitePlugin = () => {
         let route = getRoute(ctx.reactRouterConfig, file);
         let hmrEventData = { route: null };
         if (route) {
-          let serverManifest = (await server.ssrLoadModule(virtual.serverManifest.id)).default;
-          let oldRouteMetadata = serverManifest.routes[route.id];
+          let oldRouteMetadata = currentReactRouterManifestForDev?.routes[route.id];
           let newRouteMetadata = await getRouteMetadata(
             cache,
             ctx,
@@ -3633,17 +3696,17 @@ async function prerenderResourceRoute(handler, prerenderPath, clientBuildDirecto
   let normalizedPath = `${reactRouterConfig.basename}${prerenderPath}/`.replace(/\/\/+/g, "/").replace(/\/$/g, "");
   let request = new Request(`http://localhost${normalizedPath}`, requestInit);
   let response = await handler(request);
-  let text = await response.text();
+  let content = Buffer.from(await response.arrayBuffer());
   if (response.status !== 200) {
     throw new Error(
       `Prerender (resource): Received a ${response.status} status code from \`entry.server.tsx\` while prerendering the \`${normalizedPath}\` path.
-${text}`
+${content.toString("utf8")}`
     );
   }
   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);
+  await fse.outputFile(outfile, content);
   viteConfig.logger.info(
     `Prerender (resource): ${prerenderPath} -> ${import_picocolors3.default.bold(outfile)}`
   );
@@ -3742,13 +3805,24 @@ async function validateSsrFalsePrerenderExports(viteConfig, ctx, manifest, viteC
     if (exports2.includes("action")) invalidApis.push("action");
     if (invalidApis.length > 0) {
       errors.push(
-        `Prerender: ${invalidApis.length} invalid route export(s) in \`${route.id}\` when prerendering with \`ssr:false\`: ${invalidApis.join(", ")}.  See https://reactrouter.com/how-to/pre-rendering for more information.`
+        `Prerender: ${invalidApis.length} invalid route export(s) in \`${route.id}\` when pre-rendering with \`ssr:false\`: ${invalidApis.map((a) => `\`${a}\``).join(", ")}.  See https://reactrouter.com/how-to/pre-rendering#invalid-exports for more information.`
       );
     }
-    if (exports2.includes("loader") && !prerenderedRoutes.has(routeId)) {
-      errors.push(
-        `Prerender: 1 invalid route export in \`${route.id}\` when using \`ssr:false\` with \`prerender\` because the route is never prerendered so the loader will never be called.  See https://reactrouter.com/how-to/pre-rendering for more information.`
-      );
+    if (!prerenderedRoutes.has(routeId)) {
+      if (exports2.includes("loader")) {
+        errors.push(
+          `Prerender: 1 invalid route export in \`${route.id}\` when pre-rendering with \`ssr:false\`: \`loader\`. See https://reactrouter.com/how-to/pre-rendering#invalid-exports for more information.`
+        );
+      }
+      let parentRoute = route.parentId ? manifest.routes[route.parentId] : null;
+      while (parentRoute && parentRoute.id !== "root") {
+        if (parentRoute.hasLoader && !parentRoute.hasClientLoader) {
+          errors.push(
+            `Prerender: 1 invalid route export in \`${parentRoute.id}\` when pre-rendering with \`ssr:false\`: \`loader\`. See https://reactrouter.com/how-to/pre-rendering#invalid-exports for more information.`
+          );
+        }
+        parentRoute = parentRoute.parentId && parentRoute.parentId !== "root" ? manifest.routes[parentRoute.parentId] : null;
+      }
     }
   }
   if (errors.length > 0) {
@@ -4102,9 +4176,26 @@ async function getEnvironmentOptionsResolvers(ctx, buildManifest, viteCommand) {
         rollupOptions: {
           input: (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig.environments?.ssr?.build?.rollupOptions?.input : viteUserConfig.build?.rollupOptions?.input) ?? virtual.serverBuild.id
         }
-      }
+      },
+      optimizeDeps: ctx.reactRouterConfig.future.unstable_viteEnvironmentApi && viteUserConfig.environments?.ssr?.optimizeDeps?.noDiscovery === false ? {
+        entries: [
+          vite2.normalizePath(ctx.entryServerFilePath),
+          ...Object.values(ctx.reactRouterConfig.routes).map(
+            (route) => resolveRelativeRouteFilePath(route, ctx.reactRouterConfig)
+          )
+        ],
+        include: [
+          "react",
+          "react/jsx-dev-runtime",
+          "react-dom/server",
+          "react-router"
+        ]
+      } : void 0
     });
   }
+  if (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi && viteCommand === "serve") {
+    environmentOptionsResolvers[CSS_DEV_HELPER_ENVIRONMENT_NAME] = () => ({});
+  }
   return environmentOptionsResolvers;
 }
 function resolveEnvironmentsOptions(environmentResolvers, resolverOptions) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-66d5af831",
+  "version": "0.0.0-experimental-1ab091485",
   "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-66d5af831"
+    "@react-router/node": "0.0.0-experimental-1ab091485"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -106,7 +106,7 @@
     "@types/prettier": "^2.7.3",
     "@types/set-cookie-parser": "^2.4.1",
     "dotenv": "^16.0.0",
-    "esbuild-register": "^3.3.2",
+    "esbuild-register": "^3.6.0",
     "execa": "5.1.1",
     "express": "^4.19.2",
     "fast-glob": "3.2.11",
@@ -117,15 +117,15 @@
     "vite": "^6.0.0",
     "wireit": "0.14.9",
     "wrangler": "^3.28.2",
-    "react-router": "^0.0.0-experimental-66d5af831",
-    "@react-router/serve": "0.0.0-experimental-66d5af831"
+    "@react-router/serve": "0.0.0-experimental-1ab091485",
+    "react-router": "^0.0.0-experimental-1ab091485"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0 || ^6.0.0",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "^0.0.0-experimental-66d5af831",
-    "react-router": "^0.0.0-experimental-66d5af831"
+    "@react-router/serve": "^0.0.0-experimental-1ab091485",
+    "react-router": "^0.0.0-experimental-1ab091485"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {