@c0va23/react-router-dev 7.9.6 → 7.13.0

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.9.6
+ * @react-router/dev v7.13.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -52,7 +52,6 @@ var import_promises2 = require("fs/promises");
 var path6 = __toESM(require("path"));
 var url = __toESM(require("url"));
 var babel = __toESM(require("@babel/core"));
-var import_node_fetch_server2 = require("@remix-run/node-fetch-server");
 var import_react_router2 = require("react-router");
 var import_es_module_lexer = require("es-module-lexer");
 var import_pick3 = __toESM(require("lodash/pick"));
@@ -68,7 +67,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"));
@@ -549,13 +547,26 @@ 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
+    unstable_trailingSlashAwareDataRequests: userAndPresetConfigs.future?.unstable_trailingSlashAwareDataRequests ?? false,
+    v8_middleware: userAndPresetConfigs.future?.v8_middleware ?? false,
+    v8_splitRouteModules: userAndPresetConfigs.future?.v8_splitRouteModules ?? false,
+    v8_viteEnvironmentApi: userAndPresetConfigs.future?.v8_viteEnvironmentApi ?? false
   };
+  let allowedActionOrigins = userAndPresetConfigs.allowedActionOrigins ?? false;
   let reactRouterConfig = deepFreeze({
     appDirectory,
     basename: basename3,
@@ -569,6 +580,7 @@ async function resolveConfig({
     serverBundles,
     serverModuleFormat,
     ssr,
+    allowedActionOrigins,
     unstable_routeConfig: routeConfig
   });
   for (let preset of reactRouterUserConfig.presets ?? []) {
@@ -629,11 +641,11 @@ async function createConfigLoader({
         fsWatcher = import_chokidar.default.watch([root, appDirectory], {
           ignoreInitial: true,
           ignored: (path9) => {
-            let dirname5 = import_pathe3.default.dirname(path9);
-            return !dirname5.startsWith(appDirectory) && // Ensure we're only watching files outside of the app directory
+            let dirname4 = import_pathe3.default.dirname(path9);
+            return !dirname4.startsWith(appDirectory) && // Ensure we're only watching files outside of the app directory
             // that are at the root level, not nested in subdirectories
             path9 !== root && // Watch the root directory itself
-            dirname5 !== root;
+            dirname4 !== root;
           }
         });
         fsWatcher.on("all", async (...args) => {
@@ -735,9 +747,10 @@ async function resolveEntryFiles({
         `Could not find package.json in ${rootDirectory} or any of its parent directories. Please add a package.json, or provide a custom entry.server.tsx/jsx file in your app directory.`
       );
     }
+    let { readPackageJSON, sortPackage, updatePackage } = await import("pkg-types");
     let packageJsonDirectory = import_pathe3.default.dirname(packageJsonPath);
-    let pkgJson = await import_package_json.default.load(packageJsonDirectory);
-    let deps = pkgJson.content.dependencies ?? {};
+    let pkgJson = await 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 +760,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 updatePackage(packageJsonPath, (pkg) => {
+        pkg.dependencies ??= {};
+        pkg.dependencies.isbot = "^5";
+        sortPackage(pkg);
       });
-      await pkgJson.save();
       let packageManager = detectPackageManager() ?? "npm";
       (0, import_node_child_process.execSync)(`${packageManager} install`, {
         cwd: packageJsonDirectory,
@@ -766,6 +777,30 @@ async function resolveEntryFiles({
   let entryServerFilePath = userEntryServerFile ? import_pathe3.default.resolve(reactRouterConfig.appDirectory, userEntryServerFile) : import_pathe3.default.resolve(defaultsDirectory, entryServerFile);
   return { entryClientFilePath, entryServerFilePath };
 }
+async function resolveRSCEntryFiles({
+  reactRouterConfig
+}) {
+  let { appDirectory } = reactRouterConfig;
+  let defaultsDirectory = import_pathe3.default.resolve(
+    import_pathe3.default.dirname(require.resolve("@react-router/dev/package.json")),
+    "dist",
+    "config",
+    "default-rsc-entries"
+  );
+  let userEntryClientFile = findEntry(appDirectory, "entry.client", {
+    absolute: true
+  });
+  let userEntryRSCFile = findEntry(appDirectory, "entry.rsc", {
+    absolute: true
+  });
+  let userEntrySSRFile = findEntry(appDirectory, "entry.ssr", {
+    absolute: true
+  });
+  let client = userEntryClientFile ?? import_pathe3.default.join(defaultsDirectory, "entry.client.tsx");
+  let rsc = userEntryRSCFile ?? import_pathe3.default.join(defaultsDirectory, "entry.rsc.tsx");
+  let ssr = userEntrySSRFile ?? import_pathe3.default.join(defaultsDirectory, "entry.ssr.tsx");
+  return { client, rsc, ssr };
+}
 function omitRoutes(config) {
   return {
     ...config,
@@ -933,6 +968,7 @@ function generateServerBuild(ctx) {
       export const routeDiscovery: ServerBuild["routeDiscovery"];
       export const routes: ServerBuild["routes"];
       export const ssr: ServerBuild["ssr"];
+      export const allowedActionOrigins: ServerBuild["allowedActionOrigins"];
       export const unstable_getCriticalCss: ServerBuild["unstable_getCriticalCss"];
     }
   `;
@@ -1288,14 +1324,14 @@ async function watch(rootDirectory, { mode, logger, rsc }) {
 }
 
 // vite/node-adapter.ts
-var import_node_fetch_server = require("@remix-run/node-fetch-server");
-function fromNodeRequest(nodeReq, nodeRes) {
+async function fromNodeRequest(nodeReq, nodeRes) {
   invariant(
     nodeReq.originalUrl,
     "Expected `nodeReq.originalUrl` to be defined"
   );
   nodeReq.url = nodeReq.originalUrl;
-  return (0, import_node_fetch_server.createRequest)(nodeReq, nodeRes);
+  const { createRequest } = await import("@remix-run/node-fetch-server");
+  return createRequest(nodeReq, nodeRes);
 }
 
 // vite/styles.ts
@@ -2737,7 +2773,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 +2823,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,14 +2917,16 @@ 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",
                   href: "${ctx.publicPath}@react-router/critical.css?pathname=" + pathname,
                 };
               }
-            ` : ""}`;
+            ` : ""}
+      export const allowedActionOrigins = ${JSON.stringify(ctx.reactRouterConfig.allowedActionOrigins)};
+    `;
   };
   let loadViteManifest = async (directory) => {
     let manifestContents = await (0, import_promises2.readFile)(
@@ -2959,7 +2997,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 +3109,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 +3228,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 +3304,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 +3343,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 +3479,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 +3507,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)) {
@@ -3486,12 +3524,13 @@ var reactRouterVitePlugin = () => {
                 }
                 let handler = (0, import_react_router2.createRequestHandler)(build, "development");
                 let nodeHandler = async (nodeReq, nodeRes) => {
-                  let req2 = fromNodeRequest(nodeReq, nodeRes);
+                  let req2 = await fromNodeRequest(nodeReq, nodeRes);
                   let res2 = await handler(
                     req2,
                     await reactRouterDevLoadContext(req2)
                   );
-                  await (0, import_node_fetch_server2.sendResponse)(nodeRes, res2);
+                  const { sendResponse } = await import("@remix-run/node-fetch-server");
+                  await sendResponse(nodeRes, res2);
                 };
                 await nodeHandler(req, res);
               } catch (error) {
@@ -3501,22 +3540,54 @@ var reactRouterVitePlugin = () => {
           }
         };
       },
+      configurePreviewServer(previewServer) {
+        return () => {
+          if (!ctx.reactRouterConfig.ssr) {
+            return;
+          }
+          previewServer.middlewares.use(async (req, res, next) => {
+            try {
+              let serverBuildDirectory = getServerBuildDirectory(
+                ctx.reactRouterConfig
+              );
+              let serverBuildFile = path6.resolve(
+                serverBuildDirectory,
+                "index.js"
+              );
+              let build = await import(url.pathToFileURL(serverBuildFile).href);
+              let handler = (0, import_react_router2.createRequestHandler)(build, "production");
+              let nodeHandler = async (nodeReq, nodeRes) => {
+                let req2 = await fromNodeRequest(nodeReq, nodeRes);
+                let res2 = await handler(
+                  req2,
+                  await reactRouterDevLoadContext(req2)
+                );
+                const { sendResponse } = await import("@remix-run/node-fetch-server");
+                await sendResponse(nodeRes, res2);
+              };
+              await nodeHandler(req, res);
+            } catch (error) {
+              next(error);
+            }
+          });
+        };
+      },
       writeBundle: {
         // After the SSR build is finished, we inspect the Vite manifest for
         // 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 +3801,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({
@@ -4038,10 +4109,8 @@ var reactRouterVitePlugin = () => {
         if (this.environment.name !== "ssr" && modules.length <= 0) {
           return;
         }
-        let clientModules = uniqueNodes(
-          modules.flatMap(
-            (mod) => getParentClientNodes(server.environments.client.moduleGraph, mod)
-          )
+        let clientModules = modules.flatMap(
+          (mod) => getParentClientNodes(server.environments.client.moduleGraph, mod)
         );
         for (let clientModule of clientModules) {
           server.environments.client.reloadModule(clientModule);
@@ -4052,30 +4121,22 @@ var reactRouterVitePlugin = () => {
     warnOnClientSourceMaps()
   ];
 };
-function getParentClientNodes(clientModuleGraph, module2) {
+function getParentClientNodes(clientModuleGraph, module2, seenNodes = /* @__PURE__ */ new Set()) {
   if (!module2.id) {
     return [];
   }
+  if (seenNodes.has(module2.url)) {
+    return [];
+  }
+  seenNodes.add(module2.url);
   let clientModule = clientModuleGraph.getModuleById(module2.id);
   if (clientModule) {
     return [clientModule];
   }
   return [...module2.importers].flatMap(
-    (importer) => getParentClientNodes(clientModuleGraph, importer)
+    (importer) => getParentClientNodes(clientModuleGraph, importer, seenNodes)
   );
 }
-function uniqueNodes(nodes) {
-  let nodeUrls = /* @__PURE__ */ new Set();
-  let unique = [];
-  for (let node of nodes) {
-    if (nodeUrls.has(node.url)) {
-      continue;
-    }
-    nodeUrls.add(node.url);
-    unique.push(node);
-  }
-  return unique;
-}
 function addRefreshWrapper(reactRouterConfig, code, id) {
   let route = getRoute(reactRouterConfig, id);
   let acceptExports = route ? CLIENT_NON_COMPONENT_EXPORTS : [];
@@ -4350,7 +4411,21 @@ function getStaticPrerenderPaths(routes) {
   };
 }
 async function prerenderData(handler, prerenderPath, onlyRoutes, clientBuildDirectory, reactRouterConfig, viteConfig, requestInit) {
-  let normalizedPath = `${reactRouterConfig.basename}${prerenderPath === "/" ? "/_root.data" : `${prerenderPath.replace(/\/$/, "")}.data`}`.replace(/\/\/+/g, "/");
+  let dataRequestPath;
+  if (reactRouterConfig.future.unstable_trailingSlashAwareDataRequests) {
+    if (prerenderPath.endsWith("/")) {
+      dataRequestPath = `${prerenderPath}_.data`;
+    } else {
+      dataRequestPath = `${prerenderPath}.data`;
+    }
+  } else {
+    if (prerenderPath === "/") {
+      dataRequestPath = "/_root.data";
+    } else {
+      dataRequestPath = `${prerenderPath.replace(/\/$/, "")}.data`;
+    }
+  }
+  let normalizedPath = `${reactRouterConfig.basename}${dataRequestPath}`.replace(/\/\/+/g, "/");
   let url2 = new URL(`http://localhost${normalizedPath}`);
   if (onlyRoutes?.length) {
     url2.searchParams.set("_routes", onlyRoutes.join(","));
@@ -4642,7 +4717,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 +4731,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 +4835,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 +4923,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 +4939,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 +4964,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 +4979,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`
@@ -4977,7 +5052,6 @@ var import_es_module_lexer3 = require("es-module-lexer");
 var Path5 = __toESM(require("pathe"));
 var babel2 = __toESM(require("@babel/core"));
 var import_picocolors5 = __toESM(require("picocolors"));
-var import_fs = require("fs");
 var import_promises3 = require("fs/promises");
 var import_pathe6 = __toESM(require("pathe"));
 
@@ -5312,13 +5386,16 @@ function isRootRouteFile({
 
 // vite/rsc/plugin.ts
 function reactRouterRSCVitePlugin() {
+  let runningWithinTheReactRouterMonoRepo = Boolean(
+    arguments && arguments.length === 1 && typeof arguments[0] === "object" && arguments[0] && "__runningWithinTheReactRouterMonoRepo" in arguments[0] && arguments[0].__runningWithinTheReactRouterMonoRepo === true
+  );
   let configLoader;
   let typegenWatcherPromise;
   let viteCommand;
   let resolvedViteConfig;
   let routeIdByFile;
   let logger;
-  const defaultEntries2 = getDefaultEntries();
+  let entries;
   let config;
   let rootRouteFile;
   function updateConfig(newConfig) {
@@ -5337,6 +5414,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 +5431,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,31 +5454,38 @@ ${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]"
         });
+        entries = await resolveRSCEntryFiles({
+          reactRouterConfig: config
+        });
+        let viteNormalizePath = (await import("vite")).normalizePath;
         return {
           resolve: {
             dedupe: [
               // https://react.dev/warnings/invalid-hook-call-warning#duplicate-react
               "react",
+              "react/jsx-runtime",
+              "react/jsx-dev-runtime",
               "react-dom",
+              "react-dom/client",
               // Avoid router duplicates since mismatching routers cause `Error:
               // You must render this element inside a <Remix> element`.
               "react-router",
               "react-router/dom",
-              ...hasDependency({ name: "react-router-dom", rootDirectory }) ? ["react-router-dom"] : []
+              "react-router/internal/react-server-client",
+              ...hasDependency({ name: "react-router-dom", rootDirectory }) ? ["react-router-dom"] : [],
+              ...hasDependency({
+                name: "react-server-dom-webpack",
+                rootDirectory
+              }) ? ["react-server-dom-webpack"] : []
             ]
           },
           optimizeDeps: {
             entries: getOptimizeDepsEntries({
-              entryClientFilePath: defaultEntries2.client,
+              entryClientFilePath: entries.client,
               reactRouterConfig: config
             }),
             esbuildOptions: {
@@ -5410,8 +5499,17 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
               "react/jsx-runtime",
               "react/jsx-dev-runtime",
               "react-dom",
-              "react-dom/client",
-              "react-router/internal/react-server-client"
+              ...hasDependency({
+                name: "react-server-dom-webpack",
+                rootDirectory
+              }) ? ["react-server-dom-webpack"] : [],
+              ...runningWithinTheReactRouterMonoRepo ? [] : [
+                "react-router",
+                "react-router/dom",
+                "react-router/internal/react-server-client"
+              ],
+              "react-router > cookie",
+              "react-router > set-cookie-parser"
             ]
           },
           esbuild: {
@@ -5423,27 +5521,30 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
               build: {
                 rollupOptions: {
                   input: {
-                    index: defaultEntries2.client
+                    index: entries.client
+                  },
+                  output: {
+                    manualChunks(id) {
+                      const normalized = viteNormalizePath(id);
+                      if (normalized.includes("node_modules/react/") || normalized.includes("node_modules/react-dom/") || normalized.includes(
+                        "node_modules/react-server-dom-webpack/"
+                      ) || normalized.includes("node_modules/@vitejs/plugin-rsc/")) {
+                        return "react";
+                      }
+                      if (normalized.includes("node_modules/react-router/")) {
+                        return "router";
+                      }
+                    }
                   }
                 },
                 outDir: (0, import_pathe6.join)(config.buildDirectory, "client")
-              },
-              optimizeDeps: {
-                include: [
-                  "react-router > cookie",
-                  "react-router > set-cookie-parser"
-                ]
               }
             },
             rsc: {
               build: {
                 rollupOptions: {
                   input: {
-                    // We use a virtual entry here so that consumers can import
-                    // it as `virtual:react-router/unstable_rsc/rsc-entry`
-                    // without needing to know the actual file path, which is
-                    // important when using the default entries.
-                    index: defaultEntries2.rsc
+                    index: entries.rsc
                   },
                   output: {
                     entryFileNames: config.serverBuildFile,
@@ -5451,13 +5552,18 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
                   }
                 },
                 outDir: (0, import_pathe6.join)(config.buildDirectory, "server")
+              },
+              resolve: {
+                noExternal: [
+                  "@react-router/dev/config/default-rsc-entries/entry.ssr"
+                ]
               }
             },
             ssr: {
               build: {
                 rollupOptions: {
                   input: {
-                    index: defaultEntries2.ssr
+                    index: entries.ssr
                   },
                   output: {
                     // Note: We don't set `entryFileNames` here because it's
@@ -5468,6 +5574,11 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
                   }
                 },
                 outDir: (0, import_pathe6.join)(config.buildDirectory, "server/__ssr_build")
+              },
+              resolve: {
+                noExternal: [
+                  "@react-router/dev/config/default-rsc-entries/entry.rsc"
+                ]
               }
             }
           },
@@ -5571,12 +5682,6 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
         (await typegenWatcherPromise)?.close();
       }
     },
-    {
-      name: "react-router/rsc/virtual-rsc-entry",
-      resolveId(id) {
-        if (id === virtual2.rscEntry.id) return defaultEntries2.rsc;
-      }
-    },
     {
       name: "react-router/rsc/virtual-route-config",
       resolveId(id) {
@@ -5652,7 +5757,7 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
         const reactRefreshDir = import_pathe6.default.dirname(
           require.resolve("react-refresh/package.json")
         );
-        const reactRefreshRuntimePath = import_pathe6.default.join(
+        const reactRefreshRuntimePath = (0, import_pathe6.join)(
           reactRefreshDir,
           "cjs/react-refresh-runtime.development.js"
         );
@@ -5779,7 +5884,6 @@ var virtual2 = {
   injectHmrRuntime: create("unstable_rsc/inject-hmr-runtime"),
   hmrRuntime: create("unstable_rsc/runtime"),
   basename: create("unstable_rsc/basename"),
-  rscEntry: create("unstable_rsc/rsc-entry"),
   reactRouterServeConfig: create("unstable_rsc/react-router-serve-config")
 };
 function invalidateVirtualModules2(viteDevServer) {
@@ -5795,33 +5899,6 @@ function invalidateVirtualModules2(viteDevServer) {
 function getRootDirectory(viteUserConfig) {
   return viteUserConfig.root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd();
 }
-function getDevPackageRoot() {
-  const currentDir = (0, import_pathe6.dirname)(__dirname);
-  let dir = currentDir;
-  while (dir !== (0, import_pathe6.dirname)(dir)) {
-    try {
-      const packageJsonPath = (0, import_pathe6.join)(dir, "package.json");
-      (0, import_fs.readFileSync)(packageJsonPath, "utf-8");
-      return dir;
-    } catch {
-      dir = (0, import_pathe6.dirname)(dir);
-    }
-  }
-  throw new Error("Could not find package.json");
-}
-function getDefaultEntries() {
-  const defaultEntriesDir2 = (0, import_pathe6.join)(
-    getDevPackageRoot(),
-    "dist",
-    "config",
-    "default-rsc-entries"
-  );
-  return {
-    rsc: (0, import_pathe6.join)(defaultEntriesDir2, "entry.rsc.tsx"),
-    ssr: (0, import_pathe6.join)(defaultEntriesDir2, "entry.ssr.tsx"),
-    client: (0, import_pathe6.join)(defaultEntriesDir2, "entry.client.tsx")
-  };
-}
 function getModulesWithImporters(modules) {
   const visited = /* @__PURE__ */ new Set();
   const result = /* @__PURE__ */ new Set();