@react-router/dev 7.2.0 → 7.3.0-pre.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # `@react-router/dev`
 
+## 7.3.0-pre.0
+
+### Patch Changes
+
+- Fix support for custom client `build.rollupOptions.output.entryFileNames` ([#13098](https://github.com/remix-run/react-router/pull/13098))
+- Fix usage of `prerender` option when `serverBundles` option has been configured or provided by a preset, e.g. `vercelPreset` from `@vercel/react-router` ([#13082](https://github.com/remix-run/react-router/pull/13082))
+- Fix support for custom `build.assetsDir` ([#13077](https://github.com/remix-run/react-router/pull/13077))
+- Remove unused dependencies ([#13134](https://github.com/remix-run/react-router/pull/13134))
+- Stub all routes except root in "SPA Mode" server builds to avoid issues when route modules or their dependencies import non-SSR-friendly modules ([#13023](https://github.com/remix-run/react-router/pull/13023))
+- Fix errors with `future.unstable_viteEnvironmentApi` when the `ssr` environment has been configured by another plugin to be a custom `Vite.DevEnvironment` rather than the default `Vite.RunnableDevEnvironment` ([#13008](https://github.com/remix-run/react-router/pull/13008))
+- Remove unused Vite file system watcher ([#13133](https://github.com/remix-run/react-router/pull/13133))
+- Fix support for custom SSR build input when `serverBundles` option has been configured ([#13107](https://github.com/remix-run/react-router/pull/13107))
+
+  Note that for consumers using the `future.unstable_viteEnvironmentApi` and `serverBundles` options together, hyphens are no longer supported in server bundle IDs since they also need to be valid Vite environment names.
+
+- Fix dev server when using HTTPS by stripping HTTP/2 pseudo headers from dev server requests ([#12830](https://github.com/remix-run/react-router/pull/12830))
+- Lazy load Cloudflare platform proxy on first dev server request when using the `cloudflareDevProxy` Vite plugin to avoid creating unnecessary workerd processes ([#13016](https://github.com/remix-run/react-router/pull/13016))
+- When `future.unstable_viteEnvironmentApi` is enabled and the `ssr` environment has `optimizeDeps.noDiscovery` disabled, define `optimizeDeps.entries` and `optimizeDeps.include` ([#13007](https://github.com/remix-run/react-router/pull/13007))
+- Fix duplicated entries in typegen for layout routes and their corresponding index route ([#13140](https://github.com/remix-run/react-router/pull/13140))
+- Updated dependencies:
+  - `react-router@7.3.0-pre.0`
+  - `@react-router/node@7.3.0-pre.0`
+  - `@react-router/serve@7.3.0-pre.0`
+
 ## 7.2.0
 
 ### Minor Changes

package/README.md

@@ -1,5 +1,5 @@
 Dev tools and CLI for React Router that enables framework features through bundler integration like server rendering, code splitting, HMR, etc.
 
 ```sh
-npm install @react-router/dev
+npm install @react-router/dev --save-dev
 ```

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v7.2.0
+ * @react-router/dev v7.3.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -100,27 +100,53 @@ var init_vite = __esm({
   }
 });
 
+// vite/ssr-externals.ts
+var ssrExternals;
+var init_ssr_externals = __esm({
+  "vite/ssr-externals.ts"() {
+    "use strict";
+    init_is_react_router_repo();
+    ssrExternals = isReactRouterRepo() ? [
+      // This is only needed within this repo because these packages
+      // are linked to a directory outside of node_modules so Vite
+      // treats them as internal code by default.
+      "react-router",
+      "react-router-dom",
+      "@react-router/architect",
+      "@react-router/cloudflare",
+      "@react-router/dev",
+      "@react-router/express",
+      "@react-router/node",
+      "@react-router/serve"
+    ] : void 0;
+  }
+});
+
 // vite/vite-node.ts
-async function createContext(viteConfig = {}) {
+async function createContext({
+  root,
+  mode
+}) {
   await preloadVite();
   const vite2 = getVite();
-  const devServer = await vite2.createServer(
-    vite2.mergeConfig(
-      {
-        server: {
-          preTransformRequests: false,
-          hmr: false
-        },
-        optimizeDeps: {
-          noDiscovery: true
-        },
-        configFile: false,
-        envFile: false,
-        plugins: []
-      },
-      viteConfig
-    )
-  );
+  const devServer = await vite2.createServer({
+    root,
+    mode,
+    server: {
+      preTransformRequests: false,
+      hmr: false,
+      watch: null
+    },
+    ssr: {
+      external: ssrExternals
+    },
+    optimizeDeps: {
+      noDiscovery: true
+    },
+    configFile: false,
+    envFile: false,
+    plugins: []
+  });
   await devServer.pluginContainer.buildStart({});
   const server = new import_server.ViteNodeServer(devServer);
   (0, import_source_map.installSourcemapsSupport)({
@@ -146,6 +172,7 @@ var init_vite_node = __esm({
     import_client = require("vite-node/client");
     import_source_map = require("vite-node/source-map");
     init_vite();
+    init_ssr_externals();
   }
 });
 
@@ -389,6 +416,7 @@ async function resolveConfig({
     );
   }
   let future = {
+    unstable_middleware: reactRouterUserConfig.future?.unstable_middleware ?? false,
     unstable_optimizeDeps: reactRouterUserConfig.future?.unstable_optimizeDeps ?? false,
     unstable_splitRouteModules: reactRouterUserConfig.future?.unstable_splitRouteModules ?? false,
     unstable_viteEnvironmentApi: reactRouterUserConfig.future?.unstable_viteEnvironmentApi ?? false
@@ -418,11 +446,7 @@ async function createConfigLoader({
   root = root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd();
   let viteNodeContext = await createContext({
     root,
-    mode: watch2 ? "development" : "production",
-    server: !watch2 ? { watch: null } : {},
-    ssr: {
-      external: ssrExternals
-    }
+    mode: watch2 ? "development" : "production"
   });
   let reactRouterConfigFile = findEntry(root, "react-router.config", {
     absolute: true
@@ -516,7 +540,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, entryExts;
 var init_config = __esm({
   "config/config.ts"() {
     "use strict";
@@ -533,15 +557,7 @@ var init_config = __esm({
     import_isEqual = __toESM(require("lodash/isEqual"));
     init_routes();
     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;
@@ -580,19 +596,6 @@ var init_config = __esm({
       });
       return o;
     };
-    ssrExternals = isReactRouterRepo() ? [
-      // This is only needed within this repo because these packages
-      // are linked to a directory outside of node_modules so Vite
-      // treats them as internal code by default.
-      "react-router",
-      "react-router-dom",
-      "@react-router/architect",
-      "@react-router/cloudflare",
-      "@react-router/dev",
-      "@react-router/express",
-      "@react-router/node",
-      "@react-router/serve"
-    ] : void 0;
     entryExts = [".js", ".jsx", ".ts", ".tsx"];
   }
 });
@@ -769,6 +772,8 @@ function generate2(ctx, route) {
       export type HeadersArgs = T.HeadersArgs
       export type HeadersFunction = (args: HeadersArgs) => Headers | HeadersInit
 
+      export type unstable_MiddlewareFunction = T.CreateServerMiddlewareFunction<Info>
+      export type unstable_ClientMiddlewareFunction = T.CreateClientMiddlewareFunction<Info>
       export type LoaderArgs = T.CreateServerLoaderArgs<Info>
       export type ClientLoaderArgs = T.CreateClientLoaderArgs<Info>
       export type ActionArgs = T.CreateServerActionArgs<Info>
@@ -867,12 +872,16 @@ function register(ctx) {
     }
   `;
   const { t: t2 } = babel_exports;
+  const indexPaths = new Set(
+    Object.values(ctx.config.routes).filter((route) => route.index).map((route) => route.path)
+  );
   const typeParams = t2.tsTypeAliasDeclaration(
     t2.identifier("Params"),
     null,
     t2.tsTypeLiteral(
       Object.values(ctx.config.routes).map((route) => {
         if (route.id !== "root" && !route.path) return void 0;
+        if (!route.index && indexPaths.has(route.path)) return void 0;
         const lineage2 = lineage(ctx.config.routes, route);
         const fullpath2 = fullpath(lineage2);
         const params = parse2(fullpath2);
@@ -944,7 +953,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}`);
   }
@@ -1069,68 +1077,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 getServerEnvironmentKeys(ctx, record) {
+  return getServerEnvironmentEntries(ctx, record).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 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;
@@ -1165,65 +1127,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(
@@ -1231,7 +1134,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")
@@ -1275,7 +1178,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
       },
@@ -1289,6 +1200,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
@@ -1320,12 +1232,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`
+              );
             }
           }
         },
@@ -1333,22 +1248,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
@@ -1359,13 +1269,27 @@ 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: [
+          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) {
@@ -1380,7 +1304,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, CLIENT_NON_COMPONENT_EXPORTS, CLIENT_ROUTE_EXPORTS, 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";
@@ -1404,21 +1328,45 @@ var init_plugin = __esm({
     init_resolve_file_url();
     init_combine_urls();
     init_remove_exports();
+    init_ssr_externals();
     init_route_chunks();
     init_vite();
     init_config();
     init_with_props();
+    CLIENT_NON_COMPONENT_EXPORTS = [
+      "clientAction",
+      "clientLoader",
+      "unstable_clientMiddleware",
+      "handle",
+      "meta",
+      "links",
+      "shouldRevalidate"
+    ];
+    CLIENT_ROUTE_EXPORTS = [
+      ...CLIENT_NON_COMPONENT_EXPORTS,
+      "default",
+      "ErrorBoundary",
+      "HydrateFallback",
+      "Layout"
+    ];
     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"),
       browserManifest: create("browser-manifest")
     };
-    getServerBuildDirectory = (ctx, { serverBundleId } = {}) => path7.join(
-      ctx.reactRouterConfig.buildDirectory,
+    getServerBuildDirectory = (reactRouterConfig, { serverBundleId } = {}) => path7.join(
+      reactRouterConfig.buildDirectory,
       "server",
       ...serverBundleId ? [serverBundleId] : []
     );
@@ -1562,7 +1510,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")
@@ -1592,14 +1540,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(
@@ -1609,8 +1559,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/defaults/entry.server.node.tsx

@@ -15,6 +15,8 @@ export default function handleRequest(
   responseHeaders: Headers,
   routerContext: EntryContext,
   loadContext: AppLoadContext
+  // If you have middleware enabled:
+  // loadContext: unstable_RouterContextProvider
 ) {
   return new Promise((resolve, reject) => {
     let shellRendered = false;

package/dist/config.d.ts

@@ -37,15 +37,19 @@ type ServerBundlesBuildManifest = BaseBuildManifest & {
 };
 type ServerModuleFormat = "esm" | "cjs";
 interface FutureConfig {
+    /**
+     * Enable route middleware
+     */
+    unstable_middleware: boolean;
     unstable_optimizeDeps: boolean;
     /**
      * Automatically split route modules into multiple chunks when possible.
      */
-    unstable_splitRouteModules?: boolean | "enforce";
+    unstable_splitRouteModules: boolean | "enforce";
     /**
      * Use Vite Environment API (experimental)
      */
-    unstable_viteEnvironmentApi?: boolean;
+    unstable_viteEnvironmentApi: boolean;
 }
 type BuildManifest = DefaultBuildManifest | ServerBundlesBuildManifest;
 type BuildEndHook = (args: {

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.2.0
+ * @react-router/dev v7.3.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.2.0
+ * @react-router/dev v7.3.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.d.ts

@@ -1,7 +1,8 @@
-import { AppLoadContext } from 'react-router';
+import { UNSAFE_MiddlewareEnabled, unstable_InitialContext, AppLoadContext } from 'react-router';
 import { Plugin } from 'vite';
 import { GetPlatformProxyOptions, PlatformProxy } from 'wrangler';
 
+type MaybePromise<T> = T | Promise<T>;
 type CfProperties = Record<string, unknown>;
 type LoadContext<Env, Cf extends CfProperties> = {
     cloudflare: Omit<PlatformProxy<Env, Cf>, "dispose">;
@@ -9,7 +10,7 @@ type LoadContext<Env, Cf extends CfProperties> = {
 type GetLoadContext<Env, Cf extends CfProperties> = (args: {
     request: Request;
     context: LoadContext<Env, Cf>;
-}) => AppLoadContext | Promise<AppLoadContext>;
+}) => UNSAFE_MiddlewareEnabled extends true ? MaybePromise<unstable_InitialContext> : MaybePromise<AppLoadContext>;
 /**
  * Vite plugin that provides [Node proxies to local workerd
  * bindings](https://developers.cloudflare.com/workers/wrangler/api/#getplatformproxy)