@react-router/dev 0.0.0-experimental-112589a91 → 0.0.0-experimental-bfc808d6c

package/CHANGELOG.md

@@ -1,5 +1,43 @@
 # `@react-router/dev`
 
+## 7.10.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.10.0`
+  - `@react-router/node@7.10.0`
+  - `@react-router/serve@7.10.0`
+
 ## 7.9.6
 
 ### Patch Changes

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-112589a91
+ * @react-router/dev v0.0.0-experimental-bfc808d6c
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -729,7 +729,7 @@ function isEntryFileDependency(moduleGraph, entryFilepath, filepath, visited = /
   }
   return false;
 }
-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 import_node_fs, import_node_child_process, 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";
@@ -739,7 +739,6 @@ var init_config = __esm({
     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"));
@@ -2155,7 +2154,6 @@ var import_promises3 = require("fs/promises");
 var path8 = __toESM(require("path"));
 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();
 
@@ -2319,7 +2317,8 @@ async function generateEntry(entry, rootDirectory, flags = {}) {
     );
     return;
   }
-  let pkgJson = await (0, import_pkg_types2.readPackageJSON)(rootDirectory);
+  let { readPackageJSON } = await import("pkg-types");
+  let pkgJson = await readPackageJSON(rootDirectory);
   let deps = pkgJson.dependencies ?? {};
   if (!deps["@react-router/node"]) {
     console.error(import_picocolors8.default.red(`No default server entry detected.`));

package/dist/config/default-rsc-entries/entry.rsc.tsx

@@ -37,7 +37,7 @@ export default async function handler(request: Request) {
   const ssr = await import.meta.viteRsc.loadModule<
     typeof import("./entry.ssr")
   >("ssr", "index");
-  return ssr.default(request, fetchServer);
+  return ssr.default(request, await fetchServer(request));
 }
 
 if (import.meta.hot) {

package/dist/config/default-rsc-entries/entry.ssr.tsx

@@ -8,14 +8,14 @@ import {
 
 export default async function handler(
   request: Request,
-  fetchServer: (request: Request) => Promise<Response>,
+  serverResponse: Response,
 ) {
   const bootstrapScriptContent =
     await import.meta.viteRsc.loadBootstrapScriptContent("index");
 
   return routeRSCServerRequest({
     request,
-    fetchServer,
+    serverResponse,
     createFromReadableStream,
     async renderHTML(getPayload) {
       const payload = getPayload();

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-112589a91
+ * @react-router/dev v0.0.0-experimental-bfc808d6c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-112589a91
+ * @react-router/dev v0.0.0-experimental-bfc808d6c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-112589a91
+ * @react-router/dev v0.0.0-experimental-bfc808d6c
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -187,7 +187,6 @@ 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"));

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-112589a91
+ * @react-router/dev v0.0.0-experimental-bfc808d6c
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -191,7 +191,6 @@ 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"));
@@ -746,8 +745,9 @@ 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 (0, import_pkg_types.readPackageJSON)(packageJsonDirectory);
+    let pkgJson = await readPackageJSON(packageJsonDirectory);
     let deps = pkgJson.dependencies ?? {};
     if (!deps["@react-router/node"]) {
       throw new Error(
@@ -758,10 +758,10 @@ async function resolveEntryFiles({
       console.log(
         "adding `isbot@5` to your package.json, you should commit this change"
       );
-      await (0, import_pkg_types.updatePackage)(packageJsonPath, (pkg) => {
+      await updatePackage(packageJsonPath, (pkg) => {
         pkg.dependencies ??= {};
         pkg.dependencies.isbot = "^5";
-        (0, import_pkg_types.sortPackage)(pkg);
+        sortPackage(pkg);
       });
       let packageManager = detectPackageManager() ?? "npm";
       (0, import_node_child_process.execSync)(`${packageManager} install`, {
@@ -3510,6 +3510,34 @@ var reactRouterVitePlugin = () => {
           }
         };
       },
+      configurePreviewServer(previewServer) {
+        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 = fromNodeRequest(nodeReq, nodeRes);
+                let res2 = await handler(
+                  req2,
+                  await reactRouterDevLoadContext(req2)
+                );
+                await (0, import_node_fetch_server2.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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-112589a91",
+  "version": "0.0.0-experimental-bfc808d6c",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -87,7 +87,7 @@
     "tinyglobby": "^0.2.14",
     "valibot": "^1.2.0",
     "vite-node": "^3.2.2",
-    "@react-router/node": "0.0.0-experimental-112589a91"
+    "@react-router/node": "0.0.0-experimental-bfc808d6c"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -110,16 +110,16 @@
     "vite": "^6.3.0",
     "wireit": "0.14.9",
     "wrangler": "^4.23.0",
-    "@react-router/serve": "0.0.0-experimental-112589a91",
-    "react-router": "^0.0.0-experimental-112589a91"
+    "@react-router/serve": "0.0.0-experimental-bfc808d6c",
+    "react-router": "^0.0.0-experimental-bfc808d6c"
   },
   "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": "^0.0.0-experimental-112589a91",
-    "react-router": "^0.0.0-experimental-112589a91"
+    "@react-router/serve": "^0.0.0-experimental-bfc808d6c",
+    "react-router": "^0.0.0-experimental-bfc808d6c"
   },
   "peerDependenciesMeta": {
     "@vitejs/plugin-rsc": {