@react-router/dev 7.16.0 → 7.18.0

package/CHANGELOG.md

@@ -1,15 +1,46 @@
 # `@react-router/dev`
 
+## v7.18.0
+
+### Patch Changes
+
+- Pass Vite `server.watch` config to child compiler in development mode. ([#15178](https://github.com/remix-run/react-router/pull/15178))
+
+- Ignore external Vite server environments in Framework Mode build hooks ([#14883](https://github.com/remix-run/react-router/pull/14883))
+
+  When `future.v8_viteEnvironmentApi` is enabled, React Router previously treated any non-client Vite environment as its own server build. This caused issues with integrations like Nitro, where plugins can register additional environments.
+
+  Framework Mode build hooks now ignore external server environments and only process the app's own server build.
+
+- Updated dependencies:
+  - [`react-router@7.18.0`](https://github.com/remix-run/react-router/releases/tag/react-router@7.18.0)
+  - [`@react-router/node@7.18.0`](https://github.com/remix-run/react-router/releases/tag/@react-router/node@7.18.0)
+  - [`@react-router/serve@7.18.0`](https://github.com/remix-run/react-router/releases/tag/@react-router/serve@7.18.0)
+
+## v7.17.0
+
+### Patch Changes
+
+- Fix future flag warning URLs and only log each future flag warning one time ([#15138](https://github.com/remix-run/react-router/pull/15138))
+
+### Unstable Changes
+
+⚠️ _[Unstable features](https://reactrouter.com/community/api-development-strategy#unstable-flags) are not recommended for production use_
+
+- Prevent RSC route module server exports from being scanned by the client dependency optimizer when `future.unstable_optimizeDeps` is enabled. ([#15005](https://github.com/remix-run/react-router/pull/15005))
+- Updated dependencies:
+  - [`react-router@7.17.0`](https://github.com/remix-run/react-router/releases/tag/react-router@7.17.0)
+  - [`@react-router/node@7.17.0`](https://github.com/remix-run/react-router/releases/tag/@react-router/node@7.17.0)
+  - [`@react-router/serve@7.17.0`](https://github.com/remix-run/react-router/releases/tag/@react-router/serve@7.17.0)
+
 ## v7.16.0
 
 ### Minor Changes
 
 - Stabilize `future.unstable_trailingSlashAwareDataRequests` as `future.v8_trailingSlashAwareDataRequests` ([#15098](https://github.com/remix-run/react-router/pull/15098))
-
   - The unstable flag is no longer supported and will error during config resolution
 
 - Log future flag warnings for upcoming React Router v8 flags ([#15029](https://github.com/remix-run/react-router/pull/15029))
-
   - `v8_middleware`, `v8_splitRouteModules`, `v8_viteEnvironmentApi`, `v8_passThroughRequests`, `v8_trailingSlashAwareDataRequests`
 
 ### Patch Changes

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v7.16.0
+ * @react-router/dev v7.18.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -312,7 +312,8 @@ async function resolveConfig({
   viteNodeContext,
   reactRouterConfigFile,
   skipRoutes,
-  validateConfig
+  validateConfig,
+  shouldLogFutureFlagWarnings
 }) {
   let reactRouterUserConfig = {};
   if (reactRouterConfigFile) {
@@ -556,7 +557,9 @@ async function resolveConfig({
   for (let preset of reactRouterUserConfig.presets ?? []) {
     await preset.reactRouterConfigResolved?.({ reactRouterConfig });
   }
-  logFutureFlagWarnings(userAndPresetConfigs.future || {});
+  if (shouldLogFutureFlagWarnings) {
+    logFutureFlagWarnings(userAndPresetConfigs.future || {});
+  }
   return ok(reactRouterConfig);
 }
 function logFutureFlagWarning(flag, message) {
@@ -564,7 +567,7 @@ function logFutureFlagWarning(flag, message) {
     import_picocolors.default.yellow(
       `  \u26A0\uFE0F  Future Flag Warning: ${message}
      You can use the \`future.${flag}\` flag to opt in early.
-     -> https://reactrouter.com/upgrading/future-flags#${flag}`
+     -> https://reactrouter.com/v7/upgrading/future#future${flag.toLowerCase()}`
     )
   );
 }
@@ -605,7 +608,8 @@ async function createConfigLoader({
   watch: watch2,
   mode,
   skipRoutes,
-  validateConfig
+  validateConfig,
+  shouldLogFutureFlagWarnings
 }) {
   root = import_pathe3.default.normalize(root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd());
   let vite2 = await import("vite");
@@ -629,10 +633,17 @@ async function createConfigLoader({
     viteNodeContext,
     reactRouterConfigFile,
     skipRoutes,
-    validateConfig
+    validateConfig,
+    shouldLogFutureFlagWarnings
   });
   let appDirectory;
-  let initialConfigResult = await getConfig();
+  let initialConfigResult = await resolveConfig({
+    root,
+    viteNodeContext,
+    reactRouterConfigFile,
+    skipRoutes,
+    validateConfig
+  });
   if (!initialConfigResult.ok) {
     throw new Error(initialConfigResult.error);
   }
@@ -1688,9 +1699,12 @@ function extractPluginContext(viteConfig) {
 function isSsrBundleEnvironmentName(name) {
   return name.startsWith(SSR_BUNDLE_PREFIX);
 }
+function isReactRouterServerEnvironment(ctx, environmentName) {
+  return ctx.buildManifest?.serverBundles ? isSsrBundleEnvironmentName(environmentName) : environmentName === "ssr";
+}
 function getServerEnvironmentEntries(ctx, record) {
   return Object.entries(record).filter(
-    ([name]) => ctx.buildManifest?.serverBundles ? isSsrBundleEnvironmentName(name) : name === "ssr"
+    ([name]) => isReactRouterServerEnvironment(ctx, name)
   );
 }
 function getServerEnvironmentKeys(ctx, record) {

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.16.0
+ * @react-router/dev v7.18.0
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.16.0
+ * @react-router/dev v7.18.0
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.16.0
+ * @react-router/dev v7.18.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -338,7 +338,8 @@ async function resolveConfig({
   viteNodeContext,
   reactRouterConfigFile,
   skipRoutes,
-  validateConfig
+  validateConfig,
+  shouldLogFutureFlagWarnings
 }) {
   let reactRouterUserConfig = {};
   if (reactRouterConfigFile) {
@@ -582,7 +583,9 @@ async function resolveConfig({
   for (let preset of reactRouterUserConfig.presets ?? []) {
     await preset.reactRouterConfigResolved?.({ reactRouterConfig });
   }
-  logFutureFlagWarnings(userAndPresetConfigs.future || {});
+  if (shouldLogFutureFlagWarnings) {
+    logFutureFlagWarnings(userAndPresetConfigs.future || {});
+  }
   return ok(reactRouterConfig);
 }
 function logFutureFlagWarning(flag, message) {
@@ -590,7 +593,7 @@ function logFutureFlagWarning(flag, message) {
     import_picocolors.default.yellow(
       `  \u26A0\uFE0F  Future Flag Warning: ${message}
      You can use the \`future.${flag}\` flag to opt in early.
-     -> https://reactrouter.com/upgrading/future-flags#${flag}`
+     -> https://reactrouter.com/v7/upgrading/future#future${flag.toLowerCase()}`
     )
   );
 }
@@ -631,7 +634,8 @@ async function createConfigLoader({
   watch,
   mode,
   skipRoutes,
-  validateConfig
+  validateConfig,
+  shouldLogFutureFlagWarnings
 }) {
   root = import_pathe3.default.normalize(root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd());
   let vite2 = await import("vite");
@@ -655,10 +659,17 @@ async function createConfigLoader({
     viteNodeContext,
     reactRouterConfigFile,
     skipRoutes,
-    validateConfig
+    validateConfig,
+    shouldLogFutureFlagWarnings
   });
   let appDirectory;
-  let initialConfigResult = await getConfig();
+  let initialConfigResult = await resolveConfig({
+    root,
+    viteNodeContext,
+    reactRouterConfigFile,
+    skipRoutes,
+    validateConfig
+  });
   if (!initialConfigResult.ok) {
     throw new Error(initialConfigResult.error);
   }

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.16.0
+ * @react-router/dev v7.18.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -375,7 +375,8 @@ async function resolveConfig({
   viteNodeContext,
   reactRouterConfigFile,
   skipRoutes,
-  validateConfig
+  validateConfig,
+  shouldLogFutureFlagWarnings
 }) {
   let reactRouterUserConfig = {};
   if (reactRouterConfigFile) {
@@ -619,7 +620,9 @@ async function resolveConfig({
   for (let preset of reactRouterUserConfig.presets ?? []) {
     await preset.reactRouterConfigResolved?.({ reactRouterConfig });
   }
-  logFutureFlagWarnings(userAndPresetConfigs.future || {});
+  if (shouldLogFutureFlagWarnings) {
+    logFutureFlagWarnings(userAndPresetConfigs.future || {});
+  }
   return ok(reactRouterConfig);
 }
 function logFutureFlagWarning(flag, message) {
@@ -627,7 +630,7 @@ function logFutureFlagWarning(flag, message) {
     import_picocolors.default.yellow(
       `  \u26A0\uFE0F  Future Flag Warning: ${message}
      You can use the \`future.${flag}\` flag to opt in early.
-     -> https://reactrouter.com/upgrading/future-flags#${flag}`
+     -> https://reactrouter.com/v7/upgrading/future#future${flag.toLowerCase()}`
     )
   );
 }
@@ -668,7 +671,8 @@ async function createConfigLoader({
   watch: watch2,
   mode,
   skipRoutes,
-  validateConfig
+  validateConfig,
+  shouldLogFutureFlagWarnings
 }) {
   root = import_pathe3.default.normalize(root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd());
   let vite2 = await import("vite");
@@ -692,10 +696,17 @@ async function createConfigLoader({
     viteNodeContext,
     reactRouterConfigFile,
     skipRoutes,
-    validateConfig
+    validateConfig,
+    shouldLogFutureFlagWarnings
   });
   let appDirectory;
-  let initialConfigResult = await getConfig();
+  let initialConfigResult = await resolveConfig({
+    root,
+    viteNodeContext,
+    reactRouterConfigFile,
+    skipRoutes,
+    validateConfig
+  });
   if (!initialConfigResult.ok) {
     throw new Error(initialConfigResult.error);
   }
@@ -2831,9 +2842,12 @@ var SSR_BUNDLE_PREFIX = "ssrBundle_";
 function isSsrBundleEnvironmentName(name) {
   return name.startsWith(SSR_BUNDLE_PREFIX);
 }
+function isReactRouterServerEnvironment(ctx, environmentName) {
+  return ctx.buildManifest?.serverBundles ? isSsrBundleEnvironmentName(environmentName) : environmentName === "ssr";
+}
 function getServerEnvironmentEntries(ctx, record) {
   return Object.entries(record).filter(
-    ([name]) => ctx.buildManifest?.serverBundles ? isSsrBundleEnvironmentName(name) : name === "ssr"
+    ([name]) => isReactRouterServerEnvironment(ctx, name)
   );
 }
 function getServerEnvironmentValues(ctx, record) {
@@ -3574,7 +3588,8 @@ var reactRouterVitePlugin = () => {
         reactRouterConfigLoader = await createConfigLoader({
           rootDirectory,
           mode,
-          watch: viteCommand === "serve"
+          watch: viteCommand === "serve",
+          shouldLogFutureFlagWarnings: viteCommand !== "build" || viteConfigEnv.isSsrBuild === true
         });
         await updatePluginContext();
         let environments = await getEnvironmentsOptions(ctx, viteCommand, {
@@ -3689,7 +3704,7 @@ var reactRouterVitePlugin = () => {
         };
       },
       configEnvironment(name, options) {
-        if (ctx.reactRouterConfig.future.v8_viteEnvironmentApi && (ctx.buildManifest?.serverBundles ? isSsrBundleEnvironmentName(name) : name === "ssr")) {
+        if (ctx.reactRouterConfig.future.v8_viteEnvironmentApi && isReactRouterServerEnvironment(ctx, name)) {
           const vite2 = getVite();
           return {
             resolve: {
@@ -3753,7 +3768,7 @@ var reactRouterVitePlugin = () => {
           cacheDir: "node_modules/.vite-child-compiler",
           mode: viteConfig.mode,
           server: {
-            watch: viteConfig.command === "build" ? null : void 0,
+            watch: viteConfig.command === "build" ? null : viteConfig.server.watch,
             preTransformRequests: false,
             hmr: false
           },
@@ -3975,7 +3990,7 @@ var reactRouterVitePlugin = () => {
         // the SSR build and move server-only assets to client assets directory
         async handler() {
           let { future } = ctx.reactRouterConfig;
-          if (future.v8_viteEnvironmentApi ? this.environment.name === "client" : !viteConfigEnv.isSsrBuild) {
+          if (future.v8_viteEnvironmentApi ? !isReactRouterServerEnvironment(ctx, this.environment.name) : !viteConfigEnv.isSsrBuild) {
             return;
           }
           invariant(viteConfig);
@@ -6152,6 +6167,13 @@ if (import.meta.hot) {
     }
   };
 }
+function createClientRouteModuleForOptimizeDepsScan(code) {
+  const ast = import_parser.parse(code, {
+    sourceType: "module"
+  });
+  removeExports(ast, SERVER_ROUTE_EXPORTS);
+  return generate(ast);
+}
 function createId(id, type, value) {
   let [base, ...rest] = id.split("?");
   const searchParams = new URLSearchParams(rest.join("?"));
@@ -6408,6 +6430,15 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
           reactRouterConfig: config
         });
         let viteNormalizePath = (await import("vite")).normalizePath;
+        let optimizeDepsEntries = getOptimizeDepsEntries({
+          entryClientFilePath: entries.client,
+          reactRouterConfig: config
+        });
+        let routeFiles = new Set(
+          Object.values(config.routes).map(
+            (route) => resolveRelativeRouteFilePath(route, config)
+          )
+        );
         return {
           resolve: {
             dedupe: [
@@ -6430,15 +6461,18 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
             ]
           },
           optimizeDeps: {
-            entries: getOptimizeDepsEntries({
-              entryClientFilePath: entries.client,
-              reactRouterConfig: config
-            }),
+            entries: optimizeDepsEntries,
             ...defineOptimizeDepsCompilerOptions({
               rolldown: {
                 transform: {
                   jsx: "react-jsx"
-                }
+                },
+                plugins: config.future.unstable_optimizeDeps ? [
+                  createRSCOptimizeDepsRouteModulesPlugin({
+                    routeFiles,
+                    transformToJs
+                  })
+                ] : []
               },
               esbuild: {
                 jsx: "automatic"
@@ -6889,6 +6923,32 @@ function invalidateVirtualModules2(viteDevServer) {
 function getRootDirectory(viteUserConfig) {
   return viteUserConfig.root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd();
 }
+var jsRouteModuleRE = /\.[cm]?[jt]sx?$/;
+function createRSCOptimizeDepsRouteModulesPlugin({
+  routeFiles,
+  transformToJs
+}) {
+  return {
+    name: "react-router:rsc-optimize-deps-route-modules",
+    transform: {
+      filter: { id: jsRouteModuleRE },
+      async handler(code, id) {
+        let filename2 = id.split("?")[0];
+        let normalizedFilename = getVite().normalizePath(filename2);
+        if (!routeFiles.has(normalizedFilename)) {
+          return;
+        }
+        let js2 = await transformToJs(code, filename2);
+        let generated = createClientRouteModuleForOptimizeDepsScan(js2);
+        return {
+          code: generated.code,
+          map: null,
+          moduleType: "js"
+        };
+      }
+    }
+  };
+}
 var getClientBuildDirectory2 = (reactRouterConfig) => import_pathe6.default.join(reactRouterConfig.buildDirectory, "client");
 function getPrerenderConcurrencyConfig2(reactRouterConfig) {
   let concurrency = 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "7.16.0",
+  "version": "7.18.0",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -92,7 +92,7 @@
     "tinyglobby": "^0.2.14",
     "valibot": "^1.2.0",
     "vite-node": "^3.2.2",
-    "@react-router/node": "7.16.0"
+    "@react-router/node": "7.18.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -116,8 +116,8 @@
     "vite": "^6.3.0",
     "wireit": "0.14.9",
     "wrangler": "^4.23.0",
-    "react-router": "^7.16.0",
-    "@react-router/serve": "7.16.0"
+    "@react-router/serve": "7.18.0",
+    "react-router": "^7.18.0"
   },
   "peerDependencies": {
     "@vitejs/plugin-rsc": "~0.5.21",
@@ -125,8 +125,8 @@
     "typescript": "^5.1.0 || ^6.0.0",
     "vite": "^5.1.0 || ^6.0.0 || ^7.0.0 || ^8.0.0",
     "wrangler": "^3.28.2 || ^4.0.0",
-    "@react-router/serve": "^7.16.0",
-    "react-router": "^7.16.0"
+    "@react-router/serve": "^7.18.0",
+    "react-router": "^7.18.0"
   },
   "peerDependenciesMeta": {
     "@vitejs/plugin-rsc": {