@react-router/dev 7.9.6-pre.1 → 7.10.0-pre.0

package/CHANGELOG.md

@@ -1,24 +1,53 @@
 # `@react-router/dev`
 
-## 7.9.6-pre.1
+## 7.10.0-pre.0
+
+### Minor Changes
+
+- Stabilize `future.v8_splitRouteModules`, replacing `future.unstable_splitRouteModules` ([#14595](https://github.com/remix-run/react-router/pull/14595))
+  - ⚠️ This is a breaking change if you have begun using `future.unstable_splitRouteModules`. Please update your `react-router.config.ts`.
+
+- Stabilize `future.v8_viteEnvironmentApi`, replacing `future.unstable_viteEnvironmentApi` ([#14595](https://github.com/remix-run/react-router/pull/14595))
+  - ⚠️ This is a breaking change if you have begun using `future.unstable_viteEnvironmentApi`. Please update your `react-router.config.ts`.
 
 ### Patch Changes
 
+- Load environment variables before evaluating `routes.ts` ([#14446](https://github.com/remix-run/react-router/pull/14446))
+
+  For example, you can now compute your routes based on [`VITE_`-prefixed environment variables](https://vite.dev/guide/env-and-mode#env-variables):
+
+  ```txt
+  # .env
+  VITE_ENV_ROUTE=my-route
+  ```
+
+  ```ts
+  // app/routes.ts
+  import { type RouteConfig, route } from "@react-router/dev/routes";
+
+  const routes: RouteConfig = [];
+  if (import.meta.env.VITE_ENV_ROUTE === "my-route") {
+    routes.push(route("my-route", "routes/my-route.tsx"));
+  }
+
+  export default routes;
+  ```
+
 - Updated dependencies:
-  - `react-router@7.9.6-pre.1`
-  - `@react-router/node@7.9.6-pre.1`
-  - `@react-router/serve@7.9.6-pre.1`
+  - `react-router@7.10.0-pre.0`
+  - `@react-router/node@7.10.0-pre.0`
+  - `@react-router/serve@7.10.0-pre.0`
 
-## 7.9.6-pre.0
+## 7.9.6
 
 ### Patch Changes
 
 - Use a dynamic `import()` to load ESM-only `p-map` dependency to avoid issues on Node 20.18 and below ([#14492](https://github.com/remix-run/react-router/pull/14492))
 - Short circuit `HEAD` document requests before calling `renderToPipeableStream` in the default `entry.server.tsx` to more closely align with the [spec](https://httpwg.org/specs/rfc9110.html#HEAD) ([#14488](https://github.com/remix-run/react-router/pull/14488))
 - Updated dependencies:
-  - `react-router@7.9.6-pre.0`
-  - `@react-router/node@7.9.6-pre.0`
-  - `@react-router/serve@7.9.6-pre.0`
+  - `react-router@7.9.6`
+  - `@react-router/node@7.9.6`
+  - `@react-router/serve@7.9.6`
 
 ## 7.9.5
 

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v7.9.6-pre.1
+ * @react-router/dev v7.10.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -492,12 +492,23 @@ async function resolveConfig({
       );
     }
   }
+  let futureConfig = userAndPresetConfigs.future;
+  if (futureConfig?.unstable_splitRouteModules !== void 0) {
+    return err(
+      'The "future.unstable_splitRouteModules" flag has been stabilized as "future.v8_splitRouteModules"'
+    );
+  }
+  if (futureConfig?.unstable_viteEnvironmentApi !== void 0) {
+    return err(
+      'The "future.unstable_viteEnvironmentApi" flag has been stabilized as "future.v8_viteEnvironmentApi"'
+    );
+  }
   let future = {
-    v8_middleware: userAndPresetConfigs.future?.v8_middleware ?? false,
     unstable_optimizeDeps: userAndPresetConfigs.future?.unstable_optimizeDeps ?? false,
-    unstable_splitRouteModules: userAndPresetConfigs.future?.unstable_splitRouteModules ?? false,
     unstable_subResourceIntegrity: userAndPresetConfigs.future?.unstable_subResourceIntegrity ?? false,
-    unstable_viteEnvironmentApi: userAndPresetConfigs.future?.unstable_viteEnvironmentApi ?? false
+    v8_middleware: userAndPresetConfigs.future?.v8_middleware ?? false,
+    v8_splitRouteModules: userAndPresetConfigs.future?.v8_splitRouteModules ?? false,
+    v8_viteEnvironmentApi: userAndPresetConfigs.future?.v8_viteEnvironmentApi ?? false
   };
   let reactRouterConfig = deepFreeze({
     appDirectory,
@@ -718,17 +729,17 @@ function isEntryFileDependency(moduleGraph, entryFilepath, filepath, visited = /
   }
   return false;
 }
-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 import_node_fs, import_node_child_process, import_pathe3, import_chokidar, import_picocolors, import_pkg_types, import_pick2, import_omit, import_cloneDeep, import_isEqual, excludedConfigPresetKeys, mergeReactRouterConfig, deepFreeze, entryExts;
 var init_config = __esm({
   "config/config.ts"() {
     "use strict";
     import_node_fs = __toESM(require("fs"));
     import_node_child_process = require("child_process");
-    import_package_json = __toESM(require("@npmcli/package-json"));
     init_vite_node();
     import_pathe3 = __toESM(require("pathe"));
     import_chokidar = __toESM(require("chokidar"));
     import_picocolors = __toESM(require("picocolors"));
+    import_pkg_types = require("pkg-types");
     import_pick2 = __toESM(require("lodash/pick"));
     import_omit = __toESM(require("lodash/omit"));
     import_cloneDeep = __toESM(require("lodash/cloneDeep"));
@@ -1673,8 +1684,8 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
     return mergeEnvironmentOptions(getBaseOptions({ viteUserConfig }), {
       resolve: {
         external: (
-          // If `unstable_viteEnvironmentApi` is `true`, `resolve.external` is set in the `configEnvironment` hook
-          ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? void 0 : ssrExternals
+          // If `v8_viteEnvironmentApi` is `true`, `resolve.external` is set in the `configEnvironment` hook
+          ctx.reactRouterConfig.future.v8_viteEnvironmentApi ? void 0 : ssrExternals
         ),
         conditions: [...baseConditions, ...maybeDefaultServerConditions],
         externalConditions: [...baseConditions, ...defaultExternalConditions]
@@ -1689,7 +1700,7 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
         copyPublicDir: false,
         // The client only uses assets in the public directory
         rollupOptions: {
-          input: (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig.environments?.ssr?.build?.rollupOptions?.input : viteUserConfig.build?.rollupOptions?.input) ?? virtual.serverBuild.id,
+          input: (ctx.reactRouterConfig.future.v8_viteEnvironmentApi ? viteUserConfig.environments?.ssr?.build?.rollupOptions?.input : viteUserConfig.build?.rollupOptions?.input) ?? virtual.serverBuild.id,
           output: {
             entryFileNames: serverBuildFile,
             format: serverModuleFormat
@@ -1714,14 +1725,14 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
                 let code = (0, import_node_fs3.readFileSync)(routeFilePath, "utf-8");
                 return [
                   `${routeFilePath}${BUILD_CLIENT_ROUTE_QUERY_STRING}`,
-                  ...ctx.reactRouterConfig.future.unstable_splitRouteModules && !isRootRoute ? routeChunkExportNames.map(
+                  ...ctx.reactRouterConfig.future.v8_splitRouteModules && !isRootRoute ? routeChunkExportNames.map(
                     (exportName) => code.includes(exportName) ? getRouteChunkModuleId(routeFilePath, exportName) : null
                   ) : []
                 ].filter(isNonNullable);
               }
             )
           ],
-          output: (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig?.environments?.client?.build?.rollupOptions?.output : viteUserConfig?.build?.rollupOptions?.output) ?? {
+          output: (ctx.reactRouterConfig.future.v8_viteEnvironmentApi ? viteUserConfig?.environments?.client?.build?.rollupOptions?.output : viteUserConfig?.build?.rollupOptions?.output) ?? {
             entryFileNames: ({ moduleIds }) => {
               let routeChunkModuleId = moduleIds.find(isRouteChunkModuleId);
               let routeChunkName = routeChunkModuleId ? getRouteChunkNameFromModuleId(routeChunkModuleId)?.replace(
@@ -1729,7 +1740,7 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
                 ""
               ) : null;
               let routeChunkSuffix = routeChunkName ? `-${(0, import_kebabCase.default)(routeChunkName)}` : "";
-              let assetsDir = (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig?.environments?.client?.build?.assetsDir : null) ?? viteUserConfig?.build?.assetsDir ?? "assets";
+              let assetsDir = (ctx.reactRouterConfig.future.v8_viteEnvironmentApi ? viteUserConfig?.environments?.client?.build?.assetsDir : null) ?? viteUserConfig?.build?.assetsDir ?? "assets";
               return path7.posix.join(
                 assetsDir,
                 `[name]${routeChunkSuffix}-[hash].js`
@@ -1902,12 +1913,12 @@ async function build(root, viteBuildOptions) {
   }
   let config = configResult.value;
   let viteMajor = parseInt(vite2.version.split(".")[0], 10);
-  if (config.future.unstable_viteEnvironmentApi && viteMajor === 5) {
+  if (config.future.v8_viteEnvironmentApi && viteMajor === 5) {
     throw new Error(
-      "The future.unstable_viteEnvironmentApi option is not supported in Vite 5"
+      "The future.v8_viteEnvironmentApi option is not supported in Vite 5"
     );
   }
-  const useViteEnvironmentApi = config.future.unstable_viteEnvironmentApi || await hasReactRouterRscPlugin({ root, viteBuildOptions });
+  const useViteEnvironmentApi = config.future.v8_viteEnvironmentApi || await hasReactRouterRscPlugin({ root, viteBuildOptions });
   return await (useViteEnvironmentApi ? viteAppBuild(root, viteBuildOptions) : viteBuild(root, viteBuildOptions));
 }
 async function viteAppBuild(root, {
@@ -2142,9 +2153,9 @@ var import_picocolors9 = __toESM(require("picocolors"));
 var import_node_fs4 = require("fs");
 var import_promises3 = require("fs/promises");
 var path8 = __toESM(require("path"));
-var import_package_json2 = __toESM(require("@npmcli/package-json"));
 var import_exit_hook = __toESM(require("exit-hook"));
 var import_picocolors8 = __toESM(require("picocolors"));
+var import_pkg_types2 = require("pkg-types");
 var import_react_router3 = require("react-router");
 init_config();
 
@@ -2308,8 +2319,8 @@ async function generateEntry(entry, rootDirectory, flags = {}) {
     );
     return;
   }
-  let pkgJson = await import_package_json2.default.load(rootDirectory);
-  let deps = pkgJson.content.dependencies ?? {};
+  let pkgJson = await (0, import_pkg_types2.readPackageJSON)(rootDirectory);
+  let deps = pkgJson.dependencies ?? {};
   if (!deps["@react-router/node"]) {
     console.error(import_picocolors8.default.red(`No default server entry detected.`));
     return;

package/dist/config.d.ts

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

package/dist/config.js

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

package/dist/routes.js

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

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.9.6-pre.1
+ * @react-router/dev v7.10.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -108,7 +108,6 @@ function getVite() {
 // config/config.ts
 var import_node_fs = __toESM(require("fs"));
 var import_node_child_process = require("child_process");
-var import_package_json = __toESM(require("@npmcli/package-json"));
 
 // vite/ssr-externals.ts
 var ssrExternals = isReactRouterRepo() ? [
@@ -188,6 +187,7 @@ async function createContext({
 var import_pathe3 = __toESM(require("pathe"));
 var import_chokidar = __toESM(require("chokidar"));
 var import_picocolors = __toESM(require("picocolors"));
+var import_pkg_types = require("pkg-types");
 var import_pick2 = __toESM(require("lodash/pick"));
 var import_omit = __toESM(require("lodash/omit"));
 var import_cloneDeep = __toESM(require("lodash/cloneDeep"));
@@ -522,12 +522,23 @@ async function resolveConfig({
       );
     }
   }
+  let futureConfig = userAndPresetConfigs.future;
+  if (futureConfig?.unstable_splitRouteModules !== void 0) {
+    return err(
+      'The "future.unstable_splitRouteModules" flag has been stabilized as "future.v8_splitRouteModules"'
+    );
+  }
+  if (futureConfig?.unstable_viteEnvironmentApi !== void 0) {
+    return err(
+      'The "future.unstable_viteEnvironmentApi" flag has been stabilized as "future.v8_viteEnvironmentApi"'
+    );
+  }
   let future = {
-    v8_middleware: userAndPresetConfigs.future?.v8_middleware ?? false,
     unstable_optimizeDeps: userAndPresetConfigs.future?.unstable_optimizeDeps ?? false,
-    unstable_splitRouteModules: userAndPresetConfigs.future?.unstable_splitRouteModules ?? false,
     unstable_subResourceIntegrity: userAndPresetConfigs.future?.unstable_subResourceIntegrity ?? false,
-    unstable_viteEnvironmentApi: userAndPresetConfigs.future?.unstable_viteEnvironmentApi ?? false
+    v8_middleware: userAndPresetConfigs.future?.v8_middleware ?? false,
+    v8_splitRouteModules: userAndPresetConfigs.future?.v8_splitRouteModules ?? false,
+    v8_viteEnvironmentApi: userAndPresetConfigs.future?.v8_viteEnvironmentApi ?? false
   };
   let reactRouterConfig = deepFreeze({
     appDirectory,
@@ -786,7 +797,7 @@ var cloudflareDevProxyVitePlugin = (options = {}) => {
       };
     },
     configEnvironment: async (name, options2) => {
-      if (!future.unstable_viteEnvironmentApi) {
+      if (!future.v8_viteEnvironmentApi) {
         return;
       }
       if (name !== "client") {

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.9.6-pre.1
+ * @react-router/dev v7.10.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -68,7 +68,6 @@ var import_picocolors2 = require("picocolors");
 // config/config.ts
 var import_node_fs = __toESM(require("fs"));
 var import_node_child_process = require("child_process");
-var import_package_json = __toESM(require("@npmcli/package-json"));
 
 // vite/vite.ts
 var import_pathe2 = __toESM(require("pathe"));
@@ -192,6 +191,7 @@ async function createContext({
 var import_pathe3 = __toESM(require("pathe"));
 var import_chokidar = __toESM(require("chokidar"));
 var import_picocolors = __toESM(require("picocolors"));
+var import_pkg_types = require("pkg-types");
 var import_pick2 = __toESM(require("lodash/pick"));
 var import_omit = __toESM(require("lodash/omit"));
 var import_cloneDeep = __toESM(require("lodash/cloneDeep"));
@@ -549,12 +549,23 @@ async function resolveConfig({
       );
     }
   }
+  let futureConfig = userAndPresetConfigs.future;
+  if (futureConfig?.unstable_splitRouteModules !== void 0) {
+    return err(
+      'The "future.unstable_splitRouteModules" flag has been stabilized as "future.v8_splitRouteModules"'
+    );
+  }
+  if (futureConfig?.unstable_viteEnvironmentApi !== void 0) {
+    return err(
+      'The "future.unstable_viteEnvironmentApi" flag has been stabilized as "future.v8_viteEnvironmentApi"'
+    );
+  }
   let future = {
-    v8_middleware: userAndPresetConfigs.future?.v8_middleware ?? false,
     unstable_optimizeDeps: userAndPresetConfigs.future?.unstable_optimizeDeps ?? false,
-    unstable_splitRouteModules: userAndPresetConfigs.future?.unstable_splitRouteModules ?? false,
     unstable_subResourceIntegrity: userAndPresetConfigs.future?.unstable_subResourceIntegrity ?? false,
-    unstable_viteEnvironmentApi: userAndPresetConfigs.future?.unstable_viteEnvironmentApi ?? false
+    v8_middleware: userAndPresetConfigs.future?.v8_middleware ?? false,
+    v8_splitRouteModules: userAndPresetConfigs.future?.v8_splitRouteModules ?? false,
+    v8_viteEnvironmentApi: userAndPresetConfigs.future?.v8_viteEnvironmentApi ?? false
   };
   let reactRouterConfig = deepFreeze({
     appDirectory,
@@ -736,8 +747,8 @@ async function resolveEntryFiles({
       );
     }
     let packageJsonDirectory = import_pathe3.default.dirname(packageJsonPath);
-    let pkgJson = await import_package_json.default.load(packageJsonDirectory);
-    let deps = pkgJson.content.dependencies ?? {};
+    let pkgJson = await (0, import_pkg_types.readPackageJSON)(packageJsonDirectory);
+    let deps = pkgJson.dependencies ?? {};
     if (!deps["@react-router/node"]) {
       throw new Error(
         `Could not determine server runtime. Please install @react-router/node, or provide a custom entry.server.tsx/jsx file in your app directory.`
@@ -747,13 +758,11 @@ async function resolveEntryFiles({
       console.log(
         "adding `isbot@5` to your package.json, you should commit this change"
       );
-      pkgJson.update({
-        dependencies: {
-          ...pkgJson.content.dependencies,
-          isbot: "^5"
-        }
+      await (0, import_pkg_types.updatePackage)(packageJsonPath, (pkg) => {
+        pkg.dependencies ??= {};
+        pkg.dependencies.isbot = "^5";
+        (0, import_pkg_types.sortPackage)(pkg);
       });
-      await pkgJson.save();
       let packageManager = detectPackageManager() ?? "npm";
       (0, import_node_child_process.execSync)(`${packageManager} install`, {
         cwd: packageJsonDirectory,
@@ -2737,7 +2746,7 @@ var getServerBundleRouteIds = (vitePluginContext, ctx) => {
   if (!ctx.buildManifest) {
     return void 0;
   }
-  let environmentName = ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? vitePluginContext.environment.name : ctx.environmentBuildContext?.name;
+  let environmentName = ctx.reactRouterConfig.future.v8_viteEnvironmentApi ? vitePluginContext.environment.name : ctx.environmentBuildContext?.name;
   if (!environmentName || !isSsrBundleEnvironmentName(environmentName)) {
     return void 0;
   }
@@ -2787,7 +2796,7 @@ var reactRouterVitePlugin = () => {
       }
       return;
     }
-    let injectedPluginContext = !reactRouterConfig.future.unstable_viteEnvironmentApi && viteCommand === "build" ? extractPluginContext(viteUserConfig) : void 0;
+    let injectedPluginContext = !reactRouterConfig.future.v8_viteEnvironmentApi && viteCommand === "build" ? extractPluginContext(viteUserConfig) : void 0;
     let { entryClientFilePath, entryServerFilePath } = await resolveEntryFiles({
       rootDirectory,
       reactRouterConfig
@@ -2881,7 +2890,7 @@ var reactRouterVitePlugin = () => {
         }`;
     }).join(",\n  ")}
       };
-      ${ctx.reactRouterConfig.future.unstable_viteEnvironmentApi && viteCommand === "serve" ? `
+      ${ctx.reactRouterConfig.future.v8_viteEnvironmentApi && viteCommand === "serve" ? `
               export const unstable_getCriticalCss = ({ pathname }) => {
                 return {
                   rel: "stylesheet",
@@ -2959,7 +2968,7 @@ var reactRouterVitePlugin = () => {
       viteChildCompiler,
       ctx
     );
-    let enforceSplitRouteModules = ctx.reactRouterConfig.future.unstable_splitRouteModules === "enforce";
+    let enforceSplitRouteModules = ctx.reactRouterConfig.future.v8_splitRouteModules === "enforce";
     for (let route of Object.values(ctx.reactRouterConfig.routes)) {
       let routeFile = path6.join(ctx.reactRouterConfig.appDirectory, route.file);
       let sourceExports = routeManifestExports[route.id];
@@ -3071,7 +3080,7 @@ var reactRouterVitePlugin = () => {
       viteChildCompiler,
       ctx
     );
-    let enforceSplitRouteModules = ctx.reactRouterConfig.future.unstable_splitRouteModules === "enforce";
+    let enforceSplitRouteModules = ctx.reactRouterConfig.future.v8_splitRouteModules === "enforce";
     for (let [key, route] of Object.entries(ctx.reactRouterConfig.routes)) {
       let routeFile = route.file;
       let sourceExports = routeManifestExports[key];
@@ -3190,17 +3199,17 @@ var reactRouterVitePlugin = () => {
             logger: vite2.createLogger("warn", { prefix: "[react-router]" })
           });
         }
+        await loadDotenv({
+          rootDirectory,
+          viteUserConfig,
+          mode
+        });
         reactRouterConfigLoader = await createConfigLoader({
           rootDirectory,
           mode,
           watch: viteCommand === "serve"
         });
         await updatePluginContext();
-        await loadDotenv({
-          rootDirectory,
-          viteUserConfig,
-          mode
-        });
         let environments = await getEnvironmentsOptions(ctx, viteCommand, {
           viteUserConfig
         });
@@ -3266,7 +3275,7 @@ var reactRouterVitePlugin = () => {
           // will throw an error that the file is not allowed to be read.
           // https://vitejs.dev/config/server-options#server-fs-allow
           server: viteUserConfig.server?.fs?.allow ? { fs: { allow: defaultEntries } } : void 0,
-          ...ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? {
+          ...ctx.reactRouterConfig.future.v8_viteEnvironmentApi ? {
             environments,
             build: {
               // This isn't honored by the SSR environment config (which seems
@@ -3305,7 +3314,7 @@ var reactRouterVitePlugin = () => {
         };
       },
       configEnvironment(name, options) {
-        if (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi && (ctx.buildManifest?.serverBundles ? isSsrBundleEnvironmentName(name) : name === "ssr")) {
+        if (ctx.reactRouterConfig.future.v8_viteEnvironmentApi && (ctx.buildManifest?.serverBundles ? isSsrBundleEnvironmentName(name) : name === "ssr")) {
           const vite2 = getVite();
           return {
             resolve: {
@@ -3441,7 +3450,7 @@ var reactRouterVitePlugin = () => {
             }
           }
         );
-        if (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi) {
+        if (ctx.reactRouterConfig.future.v8_viteEnvironmentApi) {
           viteDevServer.middlewares.use(async (req, res, next) => {
             let [reqPathname, reqSearch] = (req.url ?? "").split("?");
             if (reqPathname.endsWith("/@react-router/critical.css")) {
@@ -3469,7 +3478,7 @@ var reactRouterVitePlugin = () => {
             viteDevServer.middlewares.use(async (req, res, next) => {
               try {
                 let build;
-                if (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi) {
+                if (ctx.reactRouterConfig.future.v8_viteEnvironmentApi) {
                   let vite2 = getVite();
                   let ssrEnvironment = viteDevServer.environments.ssr;
                   if (!vite2.isRunnableDevEnvironment(ssrEnvironment)) {
@@ -3506,17 +3515,17 @@ var reactRouterVitePlugin = () => {
         // the SSR build and move server-only assets to client assets directory
         async handler() {
           let { future } = ctx.reactRouterConfig;
-          if (future.unstable_viteEnvironmentApi ? this.environment.name === "client" : !viteConfigEnv.isSsrBuild) {
+          if (future.v8_viteEnvironmentApi ? this.environment.name === "client" : !viteConfigEnv.isSsrBuild) {
             return;
           }
           invariant(viteConfig);
           let clientBuildDirectory = getClientBuildDirectory(
             ctx.reactRouterConfig
           );
-          let serverBuildDirectory = future.unstable_viteEnvironmentApi ? this.environment.config?.build?.outDir : ctx.environmentBuildContext?.options.build?.outDir ?? getServerBuildDirectory(ctx.reactRouterConfig);
+          let serverBuildDirectory = future.v8_viteEnvironmentApi ? this.environment.config?.build?.outDir : ctx.environmentBuildContext?.options.build?.outDir ?? getServerBuildDirectory(ctx.reactRouterConfig);
           let ssrViteManifest = await loadViteManifest(serverBuildDirectory);
           let ssrAssetPaths = getViteManifestAssetPaths(ssrViteManifest);
-          let userSsrEmitAssets = (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig.environments?.ssr?.build?.ssrEmitAssets ?? viteUserConfig.environments?.ssr?.build?.emitAssets : null) ?? viteUserConfig.build?.ssrEmitAssets ?? false;
+          let userSsrEmitAssets = (ctx.reactRouterConfig.future.v8_viteEnvironmentApi ? viteUserConfig.environments?.ssr?.build?.ssrEmitAssets ?? viteUserConfig.environments?.ssr?.build?.emitAssets : null) ?? viteUserConfig.build?.ssrEmitAssets ?? false;
           let movedAssetPaths = [];
           let removedAssetPaths = [];
           let copiedAssetPaths = [];
@@ -3730,7 +3739,7 @@ var reactRouterVitePlugin = () => {
             reason: "Split round modules disabled"
           });
         }
-        let enforceSplitRouteModules = ctx.reactRouterConfig.future.unstable_splitRouteModules === "enforce";
+        let enforceSplitRouteModules = ctx.reactRouterConfig.future.v8_splitRouteModules === "enforce";
         if (enforceSplitRouteModules && chunkName === "main" && chunk) {
           let exportNames = getExportNames(chunk.code);
           validateRouteChunks({
@@ -4642,7 +4651,7 @@ async function detectRouteChunksIfEnabled(cache, ctx, id, input) {
       }
     };
   }
-  if (!ctx.reactRouterConfig.future.unstable_splitRouteModules) {
+  if (!ctx.reactRouterConfig.future.v8_splitRouteModules) {
     return noRouteChunks();
   }
   if (isRootRouteModuleId(ctx, id)) {
@@ -4656,7 +4665,7 @@ async function detectRouteChunksIfEnabled(cache, ctx, id, input) {
   return detectRouteChunks(code, cache, cacheKey);
 }
 async function getRouteChunkIfEnabled(cache, ctx, id, chunkName, input) {
-  if (!ctx.reactRouterConfig.future.unstable_splitRouteModules) {
+  if (!ctx.reactRouterConfig.future.v8_splitRouteModules) {
     return null;
   }
   let code = await resolveRouteFileCode(ctx, input);
@@ -4760,7 +4769,7 @@ async function getBuildManifest({
       if (typeof serverBundleId !== "string") {
         throw new Error(`The "serverBundles" function must return a string`);
       }
-      if (reactRouterConfig.future.unstable_viteEnvironmentApi) {
+      if (reactRouterConfig.future.v8_viteEnvironmentApi) {
         if (!/^[a-zA-Z0-9_]+$/.test(serverBundleId)) {
           throw new Error(
             `The "serverBundles" function must only return strings containing alphanumeric characters and underscores.`
@@ -4848,8 +4857,8 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
     return mergeEnvironmentOptions(getBaseOptions({ viteUserConfig }), {
       resolve: {
         external: (
-          // If `unstable_viteEnvironmentApi` is `true`, `resolve.external` is set in the `configEnvironment` hook
-          ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? void 0 : ssrExternals
+          // If `v8_viteEnvironmentApi` is `true`, `resolve.external` is set in the `configEnvironment` hook
+          ctx.reactRouterConfig.future.v8_viteEnvironmentApi ? void 0 : ssrExternals
         ),
         conditions: [...baseConditions, ...maybeDefaultServerConditions],
         externalConditions: [...baseConditions, ...defaultExternalConditions]
@@ -4864,7 +4873,7 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
         copyPublicDir: false,
         // The client only uses assets in the public directory
         rollupOptions: {
-          input: (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig.environments?.ssr?.build?.rollupOptions?.input : viteUserConfig.build?.rollupOptions?.input) ?? virtual.serverBuild.id,
+          input: (ctx.reactRouterConfig.future.v8_viteEnvironmentApi ? viteUserConfig.environments?.ssr?.build?.rollupOptions?.input : viteUserConfig.build?.rollupOptions?.input) ?? virtual.serverBuild.id,
           output: {
             entryFileNames: serverBuildFile,
             format: serverModuleFormat
@@ -4889,14 +4898,14 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
                 let code = (0, import_node_fs2.readFileSync)(routeFilePath, "utf-8");
                 return [
                   `${routeFilePath}${BUILD_CLIENT_ROUTE_QUERY_STRING}`,
-                  ...ctx.reactRouterConfig.future.unstable_splitRouteModules && !isRootRoute ? routeChunkExportNames.map(
+                  ...ctx.reactRouterConfig.future.v8_splitRouteModules && !isRootRoute ? routeChunkExportNames.map(
                     (exportName) => code.includes(exportName) ? getRouteChunkModuleId(routeFilePath, exportName) : null
                   ) : []
                 ].filter(isNonNullable);
               }
             )
           ],
-          output: (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig?.environments?.client?.build?.rollupOptions?.output : viteUserConfig?.build?.rollupOptions?.output) ?? {
+          output: (ctx.reactRouterConfig.future.v8_viteEnvironmentApi ? viteUserConfig?.environments?.client?.build?.rollupOptions?.output : viteUserConfig?.build?.rollupOptions?.output) ?? {
             entryFileNames: ({ moduleIds }) => {
               let routeChunkModuleId = moduleIds.find(isRouteChunkModuleId);
               let routeChunkName = routeChunkModuleId ? getRouteChunkNameFromModuleId(routeChunkModuleId)?.replace(
@@ -4904,7 +4913,7 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
                 ""
               ) : null;
               let routeChunkSuffix = routeChunkName ? `-${(0, import_kebabCase.default)(routeChunkName)}` : "";
-              let assetsDir = (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig?.environments?.client?.build?.assetsDir : null) ?? viteUserConfig?.build?.assetsDir ?? "assets";
+              let assetsDir = (ctx.reactRouterConfig.future.v8_viteEnvironmentApi ? viteUserConfig?.environments?.client?.build?.assetsDir : null) ?? viteUserConfig?.build?.assetsDir ?? "assets";
               return path6.posix.join(
                 assetsDir,
                 `[name]${routeChunkSuffix}-[hash].js`
@@ -5337,6 +5346,11 @@ function reactRouterRSCVitePlugin() {
         viteCommand = command;
         const rootDirectory = getRootDirectory(viteUserConfig);
         const watch2 = command === "serve";
+        await loadDotenv({
+          rootDirectory,
+          viteUserConfig,
+          mode
+        });
         configLoader = await createConfigLoader({
           rootDirectory,
           mode,
@@ -5349,12 +5363,12 @@ function reactRouterRSCVitePlugin() {
             if (userConfig.routeDiscovery) errors.push("routeDiscovery");
             if (userConfig.serverBundles) errors.push("serverBundles");
             if (userConfig.ssr === false) errors.push("ssr: false");
-            if (userConfig.future?.unstable_splitRouteModules)
-              errors.push("future.unstable_splitRouteModules");
-            if (userConfig.future?.unstable_viteEnvironmentApi === false)
-              errors.push("future.unstable_viteEnvironmentApi: false");
             if (userConfig.future?.v8_middleware === false)
               errors.push("future.v8_middleware: false");
+            if (userConfig.future?.v8_splitRouteModules)
+              errors.push("future.v8_splitRouteModules");
+            if (userConfig.future?.v8_viteEnvironmentApi === false)
+              errors.push("future.v8_viteEnvironmentApi: false");
             if (userConfig.future?.unstable_subResourceIntegrity)
               errors.push("future.unstable_subResourceIntegrity");
             if (errors.length) {
@@ -5372,11 +5386,6 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
             "When using the React Router `basename` and the Vite `base` config, the `basename` config must begin with `base` for the default Vite dev server."
           );
         }
-        await loadDotenv({
-          rootDirectory,
-          viteUserConfig,
-          mode
-        });
         const vite2 = await import("vite");
         logger = vite2.createLogger(viteUserConfig.logLevel, {
           prefix: "[react-router]"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "7.9.6-pre.1",
+  "version": "7.10.0-pre.0",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -67,7 +67,6 @@
     "@babel/preset-typescript": "^7.27.1",
     "@babel/traverse": "^7.27.7",
     "@babel/types": "^7.27.7",
-    "@npmcli/package-json": "^4.0.1",
     "@remix-run/node-fetch-server": "^0.9.0",
     "arg": "^5.0.1",
     "babel-dead-code-elimination": "^1.0.6",
@@ -81,13 +80,14 @@
     "p-map": "^7.0.3",
     "pathe": "^1.1.2",
     "picocolors": "^1.1.1",
+    "pkg-types": "^2.3.0",
     "prettier": "^3.6.2",
     "react-refresh": "^0.14.0",
     "semver": "^7.3.7",
     "tinyglobby": "^0.2.14",
     "valibot": "^1.1.0",
     "vite-node": "^3.2.2",
-    "@react-router/node": "7.9.6-pre.1"
+    "@react-router/node": "7.10.0-pre.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -107,19 +107,19 @@
     "fast-glob": "3.2.11",
     "tsup": "^8.3.0",
     "typescript": "^5.1.6",
-    "vite": "^6.1.0",
+    "vite": "^6.3.0",
     "wireit": "0.14.9",
     "wrangler": "^4.23.0",
-    "@react-router/serve": "7.9.6-pre.1",
-    "react-router": "^7.9.6-pre.1"
+    "@react-router/serve": "7.10.0-pre.0",
+    "react-router": "^7.10.0-pre.0"
   },
   "peerDependencies": {
     "@vitejs/plugin-rsc": "*",
     "typescript": "^5.1.0",
     "vite": "^5.1.0 || ^6.0.0 || ^7.0.0",
     "wrangler": "^3.28.2 || ^4.0.0",
-    "@react-router/serve": "^7.9.6-pre.1",
-    "react-router": "^7.9.6-pre.1"
+    "@react-router/serve": "^7.10.0-pre.0",
+    "react-router": "^7.10.0-pre.0"
   },
   "peerDependenciesMeta": {
     "@vitejs/plugin-rsc": {