Merge branch 'release-next'

Author: brophdawg11

.eslintignore

@@ -3,6 +3,7 @@ node_modules/
 pnpm-lock.yaml
 /docs/api
 examples/**/dist/
+/integration/helpers/vite-plugin-cloudflare-template/worker-configuration.d.ts
 /playground/
 /playground-local/
 packages/**/dist/

CHANGELOG.md

@@ -74,8 +74,7 @@ test.describe("actions", () => {
         `,
 
         [`app/routes/${THROWS_REDIRECT}.jsx`]: js`
-          import { redirect } from "react-router";
-          import { Form } from "react-router";
+          import { redirect, Form } from "react-router";
 
           export function action() {
             throw redirect("/${REDIRECT_TARGET}")

integration/action-test.ts

@@ -40,7 +40,7 @@ test("handles synchronous proceeding correctly", async ({ page }) => {
       `,
       "app/routes/b.tsx": js`
       import * as React from "react";
-      import { Form, useAction, useBlocker } from "react-router";
+      import { Form, useBlocker } from "react-router";
         export default function Component() {
           return (
             <div>

integration/blocking-test.ts

@@ -335,7 +335,6 @@ test.describe("Client Data", () => {
               }),
               "app/routes/parent.child.tsx": js`
                 import * as React from 'react';
-                import { json } from "react-router"
                 import { Await, useLoaderData } from "react-router"
                 export function loader() {
                   return {
@@ -685,7 +684,6 @@ test.describe("Client Data", () => {
                 }),
                 "app/routes/parent.child.tsx": js`
                   import * as React from 'react';
-                  import { json } from "react-router";
                   import { useLoaderData, useRevalidator } from "react-router";
                   let isFirstCall = true;
                   export async function loader({ serverLoader }) {
@@ -763,7 +761,7 @@ test.describe("Client Data", () => {
                     childClientLoaderHydrate: false,
                   }),
                   "app/routes/parent.child.tsx": js`
-                    import { ClientLoaderFunctionArgs, useRouteError } from "react-router";
+                    import { useRouteError } from "react-router";
 
                     export function loader() {
                       throw new Error("Broken!")
@@ -1286,7 +1284,6 @@ test.describe("Client Data", () => {
                 }),
                 "app/routes/parent.child.tsx": js`
                   import * as React from 'react';
-                  import { json } from "react-router";
                   import { Form, useRouteError } from "react-router";
                   export async function clientAction({ serverAction }) {
                     return await serverAction();
@@ -1508,7 +1505,6 @@ test.describe("Client Data", () => {
                 }),
                 "app/routes/parent.child.tsx": js`
                   import * as React from 'react';
-                  import { json } from "react-router";
                   import { Form, useRouteError } from "react-router";
                   export async function clientAction({ serverAction }) {
                     return await serverAction();

integration/client-data-test.ts

@@ -971,7 +971,6 @@ test("Allows back-button out of an error boundary after a hard reload", async ({
         `,
 
       "app/routes/boom.tsx": js`
-          import { json } from "react-router";
           export function loader() { return boom(); }
           export default function() { return <b>my page</b>; }
         `,

integration/error-boundary-test.ts

@@ -14,7 +14,6 @@ test.beforeAll(async () => {
   fixture = await createFixture({
     files: {
       "app/routes/_index.tsx": js`
-        import { json } from "react-router";
         import { useLoaderData } from "react-router";
         export async function loader() {
           const resp = await fetch('https://reqres.in/api/users?page=2');

integration/fetch-globals-test.ts

@@ -23,7 +23,6 @@ test.describe("useFetcher", () => {
     fixture = await createFixture({
       files: {
         "app/routes/resource-route-action-only.ts": js`
-          import { json } from "react-router";
           export function action() {
             return new Response("${CHEESESTEAK}");
           }

integration/fetcher-test.ts

@@ -19,14 +19,6 @@ test.describe("fs-routes", () => {
   test.beforeAll(async () => {
     fixture = await createFixture({
       files: {
-        "vite.config.js": js`
-          import { defineConfig } from "vite";
-          import { reactRouter } from "@react-router/dev/vite";
-
-          export default defineConfig({
-            plugins: [reactRouter()],
-          });
-        `,
         "app/routes.ts": js`
           import { type RouteConfig } from "@react-router/dev/routes";  
           import { flatRoutes } from "@react-router/fs-routes";

integration/fs-routes-test.ts

@@ -18,7 +18,7 @@ import {
 import { createRequestHandler as createExpressHandler } from "@react-router/express";
 import { createReadableStreamFromReadable } from "@react-router/node";
 
-import { viteConfig, reactRouterConfig } from "./vite.js";
+import { type TemplateName, viteConfig, reactRouterConfig } from "./vite.js";
 
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 const root = path.join(__dirname, "../..");
@@ -31,6 +31,7 @@ export interface FixtureInit {
   spaMode?: boolean;
   prerender?: boolean;
   port?: number;
+  templateName?: TemplateName;
 }
 
 export type Fixture = Awaited<ReturnType<typeof createFixture>>;
@@ -362,7 +363,7 @@ export async function createFixtureProject(
   init: FixtureInit = {},
   mode?: ServerMode
 ): Promise<string> {
-  let template = "vite-5-template";
+  let template = init.templateName ?? "vite-5-template";
   let integrationTemplateDir = path.resolve(__dirname, template);
   let projectName = `rr-${template}-${Math.random().toString(32).slice(2)}`;
   let projectDir = path.join(TMP_DIR, projectName);
@@ -424,6 +425,9 @@ function build(projectDir: string, buildStdio?: Writable, mode?: ServerMode) {
     env: {
       ...process.env,
       NODE_ENV: mode || ServerMode.Production,
+      // Ensure build can pass in Rolldown. This can be removed once
+      // "preserveEntrySignatures" is supported in rolldown-vite.
+      ROLLDOWN_OPTIONS_VALIDATION: "loose",
     },
   });