[pull] main from remix-run:main

integration/vite-dotenv-test.ts

@@ -2,18 +2,32 @@ import { test, expect } from "@playwright/test";
 import getPort from "get-port";
 
 import {
+  type TemplateName,
   createProject,
   customDev,
   EXPRESS_SERVER,
   viteConfig,
 } from "./helpers/vite.js";
 
-let getFiles = async ({ envDir, port }: { envDir?: string; port: number }) => {
+const templateNames = [
+  "vite-5-template",
+  "rsc-vite-framework",
+] as const satisfies TemplateName[];
+
+let getFiles = async ({
+  templateName,
+  envDir,
+  port,
+}: {
+  templateName: TemplateName;
+  envDir?: string;
+  port: number;
+}) => {
   let envPath = `${envDir ? `${envDir}/` : ""}.env`;
 
   return {
-    "vite.config.js": await viteConfig.basic({ port, envDir }),
-    "server.mjs": EXPRESS_SERVER({ port }),
+    "vite.config.js": await viteConfig.basic({ templateName, port, envDir }),
+    "server.mjs": EXPRESS_SERVER({ port, templateName }),
     [envPath]: `
       ENV_VAR_FROM_DOTENV_FILE=Content from ${envPath} file
     `,
@@ -49,72 +63,90 @@ let getFiles = async ({ envDir, port }: { envDir?: string; port: number }) => {
 };
 
 test.describe("Vite .env", () => {
-  test.describe("defaults", async () => {
-    let port: number;
-    let cwd: string;
-    let stop: () => void;
-
-    test.beforeAll(async () => {
-      port = await getPort();
-      cwd = await createProject(await getFiles({ port }));
-      stop = await customDev({ cwd, port });
-    });
-    test.afterAll(() => stop());
-
-    test("express", async ({ page }) => {
-      let pageErrors: unknown[] = [];
-      page.on("pageerror", (error) => pageErrors.push(error));
-
-      await page.goto(`http://localhost:${port}/dotenv`, {
-        waitUntil: "networkidle",
+  for (const templateName of templateNames) {
+    test.describe(`template: ${templateName}`, () => {
+      test.describe("defaults", async () => {
+        let port: number;
+        let cwd: string;
+        let stop: () => void;
+
+        test.beforeAll(async () => {
+          port = await getPort();
+          cwd = await createProject(
+            await getFiles({ port, templateName }),
+            templateName,
+          );
+          stop = await customDev({ cwd, port });
+        });
+        test.afterAll(() => stop());
+
+        test("express", async ({ page }) => {
+          let pageErrors: unknown[] = [];
+          page.on("pageerror", (error) => pageErrors.push(error));
+
+          await page.goto(`http://localhost:${port}/dotenv`, {
+            waitUntil: "networkidle",
+          });
+          expect(pageErrors).toEqual([]);
+
+          let loaderContent = page.locator(
+            "[data-dotenv-route-loader-content]",
+          );
+          await expect(loaderContent).toHaveText("Content from .env file");
+
+          let clientContent = page.locator(
+            "[data-dotenv-route-client-content]",
+          );
+          await expect(clientContent).toHaveText(
+            "process.env.ENV_VAR_FROM_DOTENV_FILE not available on the client, which is a good thing",
+          );
+
+          expect(pageErrors).toEqual([]);
+        });
       });
-      expect(pageErrors).toEqual([]);
-
-      let loaderContent = page.locator("[data-dotenv-route-loader-content]");
-      await expect(loaderContent).toHaveText("Content from .env file");
-
-      let clientContent = page.locator("[data-dotenv-route-client-content]");
-      await expect(clientContent).toHaveText(
-        "process.env.ENV_VAR_FROM_DOTENV_FILE not available on the client, which is a good thing",
-      );
-
-      expect(pageErrors).toEqual([]);
-    });
-  });
-
-  test.describe("custom env dir", async () => {
-    let port: number;
-    let cwd: string;
-    let stop: () => void;
-
-    test.beforeAll(async () => {
-      const envDir = "custom-env-dir";
-      port = await getPort();
-      cwd = await createProject(await getFiles({ envDir, port }));
-      stop = await customDev({ cwd, port });
-    });
-    test.afterAll(() => stop());
-
-    test("express", async ({ page }) => {
-      let pageErrors: unknown[] = [];
-      page.on("pageerror", (error) => pageErrors.push(error));
 
-      await page.goto(`http://localhost:${port}/dotenv`, {
-        waitUntil: "networkidle",
+      test.describe("custom env dir", async () => {
+        let port: number;
+        let cwd: string;
+        let stop: () => void;
+
+        test.beforeAll(async () => {
+          const envDir = "custom-env-dir";
+          port = await getPort();
+          cwd = await createProject(
+            await getFiles({ envDir, port, templateName }),
+            templateName,
+          );
+          stop = await customDev({ cwd, port });
+        });
+        test.afterAll(() => stop());
+
+        test("express", async ({ page }) => {
+          let pageErrors: unknown[] = [];
+          page.on("pageerror", (error) => pageErrors.push(error));
+
+          await page.goto(`http://localhost:${port}/dotenv`, {
+            waitUntil: "networkidle",
+          });
+          expect(pageErrors).toEqual([]);
+
+          let loaderContent = page.locator(
+            "[data-dotenv-route-loader-content]",
+          );
+          await expect(loaderContent).toHaveText(
+            "Content from custom-env-dir/.env file",
+          );
+
+          let clientContent = page.locator(
+            "[data-dotenv-route-client-content]",
+          );
+          await expect(clientContent).toHaveText(
+            "process.env.ENV_VAR_FROM_DOTENV_FILE not available on the client, which is a good thing",
+          );
+
+          expect(pageErrors).toEqual([]);
+        });
       });
-      expect(pageErrors).toEqual([]);
-
-      let loaderContent = page.locator("[data-dotenv-route-loader-content]");
-      await expect(loaderContent).toHaveText(
-        "Content from custom-env-dir/.env file",
-      );
-
-      let clientContent = page.locator("[data-dotenv-route-client-content]");
-      await expect(clientContent).toHaveText(
-        "process.env.ENV_VAR_FROM_DOTENV_FILE not available on the client, which is a good thing",
-      );
-
-      expect(pageErrors).toEqual([]);
     });
-  });
+  }
 });

packages/create-react-router/CHANGELOG.md

@@ -1,5 +1,9 @@
 # `create-react-router`
 
+## 7.9.1
+
+_No changes_
+
 ## 7.9.0
 
 _No changes_

packages/create-react-router/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-react-router",
-  "version": "7.9.0",
+  "version": "7.9.1",
   "description": "Create a new React Router app",
   "homepage": "https://reactrouter.com",
   "bugs": {

packages/react-router-architect/CHANGELOG.md

@@ -1,5 +1,13 @@
 # `@react-router/architect`
 
+## 7.9.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `react-router@7.9.1`
+  - `@react-router/node@7.9.1`
+
 ## 7.9.0
 
 ### Minor Changes

packages/react-router-architect/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/architect",
-  "version": "7.9.0",
+  "version": "7.9.1",
   "description": "Architect server request handler for React Router",
   "bugs": {
     "url": "https://github.com/remix-run/react-router/issues"

packages/react-router-cloudflare/CHANGELOG.md

@@ -1,5 +1,12 @@
 # `@react-router/cloudflare`
 
+## 7.9.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `react-router@7.9.1`
+
 ## 7.9.0
 
 ### Minor Changes

packages/react-router-cloudflare/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/cloudflare",
-  "version": "7.9.0",
+  "version": "7.9.1",
   "description": "Cloudflare platform abstractions for React Router",
   "bugs": {
     "url": "https://github.com/remix-run/react-router/issues"

packages/react-router-dev/CHANGELOG.md

@@ -1,5 +1,15 @@
 # `@react-router/dev`
 
+## 7.9.1
+
+### Patch Changes
+
+- Fix internal `Future` interface naming from `middleware` -> `v8_middleware` ([#14327](https://github.com/remix-run/react-router/pull/14327))
+- Updated dependencies:
+  - `react-router@7.9.1`
+  - `@react-router/node@7.9.1`
+  - `@react-router/serve@7.9.1`
+
 ## 7.9.0
 
 ### Minor Changes

packages/react-router-dev/cli/commands.ts

@@ -247,13 +247,22 @@ export async function typegen(
 ) {
   root = resolveRootDirectory(root, flags);
 
+  const rsc = await hasReactRouterRscPlugin({
+    root,
+    viteBuildOptions: {
+      config: flags.config,
+      mode: flags.mode,
+    },
+  });
+
   if (flags.watch) {
     await preloadVite();
     const vite = getVite();
     const logger = vite.createLogger("info", { prefix: "[react-router]" });
 
     await Typegen.watch(root, {
       mode: flags.mode ?? "development",
+      rsc,
       logger,
     });
     await new Promise(() => {}); // keep alive
@@ -262,5 +271,6 @@ export async function typegen(
 
   await Typegen.run(root, {
     mode: flags.mode ?? "production",
+    rsc,
   });
 }

packages/react-router-dev/config/config.ts

@@ -345,6 +345,8 @@ type Result<T> =
       error: string;
     };
 
+type ConfigResult = Result<ResolvedReactRouterConfig>;
+
 function ok<T>(value: T): Result<T> {
   return { ok: true, value };
 }
@@ -365,7 +367,7 @@ async function resolveConfig({
   reactRouterConfigFile?: string;
   skipRoutes?: boolean;
   validateConfig?: ValidateConfigFunction;
-}): Promise<Result<ResolvedReactRouterConfig>> {
+}): Promise<ConfigResult> {
   let reactRouterUserConfig: ReactRouterConfig = {};
 
   if (reactRouterConfigFile) {
@@ -506,7 +508,7 @@ async function resolveConfig({
   let appDirectory = Path.resolve(root, userAppDirectory || "app");
   let buildDirectory = Path.resolve(root, userBuildDirectory);
 
-  let rootRouteFile = findEntry(appDirectory, "root");
+  let rootRouteFile = findEntry(appDirectory, "root", { absolute: true });
   if (!rootRouteFile) {
     let rootRouteDisplayPath = Path.relative(
       root,
@@ -556,7 +558,7 @@ async function resolveConfig({
         {
           id: "root",
           path: "",
-          file: rootRouteFile,
+          file: Path.relative(appDirectory, rootRouteFile),
           children: result.routeConfig,
         },
       ];
@@ -622,7 +624,7 @@ async function resolveConfig({
 type ChokidarEventName = ChokidarEmitArgs[0];
 
 type ChangeHandler = (args: {
-  result: Result<ResolvedReactRouterConfig>;
+  result: ConfigResult;
   configCodeChanged: boolean;
   routeConfigCodeChanged: boolean;
   configChanged: boolean;
@@ -632,7 +634,7 @@ type ChangeHandler = (args: {
 }) => void;
 
 export type ConfigLoader = {
-  getConfig: () => Promise<Result<ResolvedReactRouterConfig>>;
+  getConfig: () => Promise<ConfigResult>;
   onChange: (handler: ChangeHandler) => () => void;
   close: () => Promise<void>;
 };

packages/react-router-dev/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "7.9.0",
+  "version": "7.9.1",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {

packages/react-router-dev/typegen/context.ts

@@ -8,16 +8,19 @@ export type Context = {
   rootDirectory: string;
   configLoader: ConfigLoader;
   config: ResolvedReactRouterConfig;
+  rsc: boolean;
 };
 
 export async function createContext({
   rootDirectory,
   watch,
   mode,
+  rsc,
 }: {
   rootDirectory: string;
   watch: boolean;
   mode: string;
+  rsc: boolean;
 }): Promise<Context> {
   const configLoader = await createConfigLoader({ rootDirectory, mode, watch });
   const configResult = await configLoader.getConfig();
@@ -32,5 +35,6 @@ export async function createContext({
     configLoader,
     rootDirectory,
     config,
+    rsc,
   };
 }