Merge branch 'main' into release-next

Author: brophdawg11

GOVERNANCE.md

@@ -74,9 +74,12 @@ Due to the large number of React Router applications out there, we have to be a
 
 ## New Feature Process
 
-The process for new features being added to React Router will follow a series of stages loosely based on the [TC39 Process](https://tc39.es/process-document/). It is important to note that entrance into any given stage does not imply that an RFC will proceed any further. The stages will act as a funnel with fewer RFCs making it into later stages such that only the strongest RFCs make it into a React Router release in a stable fashion. This table gives a high-level overview of the stages, but please see the individual stage sections below for more detailed information on the stages and the process for moving an FC through them.
+The process for new features being added to React Router will follow a series of stages loosely based on the [TC39 Process](https://tc39.es/process-document/). It is important to note that entrance into any given stage does not imply that an RFC will proceed any further. The stages will act as a funnel with fewer RFCs making it into later stages such that only the strongest RFCs make it into a React Router release in a stable fashion.
 
-Once a feature reaches Stage 2, it will be added to the [Roadmap](https://github.com/orgs/remix-run/projects/5) where it can be tracked as it moves through the stages.
+> [!NOTE]
+> Most new community-driven features for React Router will go through all stages. Some features, if trivial or obvious enough, may skip stages and be implemented directly as a stable feature.
+
+This table gives a high-level overview of the stages, but please see the individual stage sections below for more detailed information on the stages and the process for moving an FC through them. Once a feature reaches Stage 2, it will be added to the [Roadmap](https://github.com/orgs/remix-run/projects/5) where it can be tracked as it moves through the stages.
 
 | Stage | Name          | Entrance Criteria                                                                                                                      | Purpose                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
 | ----- | ------------- | -------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -87,8 +90,6 @@ Once a feature reaches Stage 2, it will be added to the [Roadmap](https://github
 | 4     | Stabilization | At least 1 month in the Beta stage and PR opened to stabilize the APIs. This PR should also include documentation for the new feature. | The **Stabilization** phase exists to ensure that unstable features are available for enough time for applications to update their React Router version and opt-into beta testing. We don't want to rush features through beta testing so that we have maximal feedback prior to stabilizing a feature.                                                                                                                                                                           |
 | 5     | Stable        | PR approval from at least 50% of the SC members indicating their acceptance of the PR for a stable API                                 | A RFC is completed and enters the **Stable** stage once enough members of the SC feel comfortable not only with the code for the stable feature, but have also seen positive feedback from beta testers that the feature is working as expected. Once an **Beta** stage PR has enough SC approvals and has spent the required amount of time in the **Beta** stage, it can be merged and included in the next React Router release.                                               |
 
-To get a feature accepted and implemented in React Router, it will go through the following stages:
-
 ## New Feature Stages
 
 ### Stage 0 — Proposal

contributors.yml

@@ -66,6 +66,7 @@
 - bvangraafeiland
 - camthompson
 - CanRau
+- caprolactam
 - cassidoo
 - chaance
 - chasinhues
@@ -238,6 +239,7 @@
 - markdalgleish
 - markivancho
 - markmals
+- Marlon-Buckley
 - maruffahmed
 - marvinruder
 - mathpaquette
@@ -355,6 +357,7 @@
 - sorokya
 - sorrycc
 - souzasmatheus
+- SovietGhost
 - soxtoby
 - srmagura
 - SsongQ-92

docs/api/framework-conventions/server-modules.md

@@ -11,7 +11,7 @@ title: .server modules
 Server-only modules that are excluded from client bundles and only run on the server.
 
 ```ts filename=auth.server.ts
-// This would expose secrets on the client
+// This would expose secrets on the client if not exported from a server-only module
 export const JWT_SECRET = process.env.JWT_SECRET;
 
 export function validateToken(token: string) {
@@ -21,12 +21,19 @@ export function validateToken(token: string) {
 
 `.server` modules are a good way to explicitly mark entire modules as server-only. The build will fail if any code in a `.server` file or `.server` directory accidentally ends up in the client module graph.
 
+<docs-warning>
+
+Route modules should not be marked as `.server` or `.client` as they have special handling and need to be referenced in both server and client module graphs. Attempting to do so will cause build errors.
+
+</docs-warning>
+
 <docs-info>
 
 If you need more sophisticated control over what is included in the client/server bundles, check out the [`vite-env-only` plugin](https://github.com/pcattori/vite-env-only).
 
 </docs-info>
 
+
 ## Usage Patterns
 
 ### Individual Files

docs/api/hooks/useSearchParams.md

@@ -59,7 +59,8 @@ setSearchParams([["tab", "1"]]);
 setSearchParams(new URLSearchParams("?tab=1"));
 ```
 
-It also supports a function callback like React's [`setState`](https://react.dev/reference/react/useState#setstate):
+It also supports a function callback like React's
+[`setState`](https://react.dev/reference/react/useState#setstate):
 
 ```tsx
 setSearchParams((searchParams) => {
@@ -68,6 +69,12 @@ setSearchParams((searchParams) => {
 });
 ```
 
+<docs-warning>The function callback version of `setSearchParams` does not support
+the [queueing](https://react.dev/reference/react/useState#setstate-parameters)
+logic that React's `setState` implements.  Multiple calls to `setSearchParams`
+in the same tick will not build on the prior value.  If you need this behavior,
+you can use `setState` manually.</docs-warning>
+
 ### Notes
 
 Note that `searchParams` is a stable reference, so you can reliably use it

docs/explanation/code-splitting.md

@@ -31,7 +31,7 @@ Instead of bundling all routes into a single giant build, the modules referenced
 
 Because these entry points are coupled to URL segments, React Router knows just from a URL which bundles are needed in the browser, and more importantly, which are not.
 
-If the user visits `"/about"` then the bundles for `about.tsx` will be loaded but not `contact.tsx`. This ensures drastically reduces the JavaScript footprint for initial page loads and speeds up your application.
+If the user visits `"/about"` then the bundles for `about.tsx` will be loaded but not `contact.tsx`. This drastically reduces the JavaScript footprint for initial page loads and speeds up your application.
 
 ## Removal of Server Code
 

docs/how-to/file-uploads.md

@@ -9,8 +9,6 @@ title: File Uploads
 <br/>
 <br/>
 
-Handle file uploads in your React Router applications. This guide uses some packages from the [Remix The Web][remix-the-web] project to make file uploads easier.
-
 _Thank you to David Adams for [writing an original guide](https://programmingarehard.com/2024/09/06/remix-file-uploads-updated.html/) on which this doc is based. You can refer to it for even more examples._
 
 ## Basic File Upload
@@ -38,7 +36,7 @@ export default [
 `form-data-parser` is a wrapper around `request.formData()` that provides streaming support for handling file uploads.
 
 ```shellscript
-npm i @mjackson/form-data-parser
+npm i @remix-run/form-data-parser
 ```
 
 [See the `form-data-parser` docs for more information][form-data-parser]
@@ -57,11 +55,12 @@ You must set the form's `enctype` to `multipart/form-data` for file uploads to w
 import {
   type FileUpload,
   parseFormData,
-} from "@mjackson/form-data-parser";
+} from "@remix-run/form-data-parser";
+import type { Route } from "./+types/user-profile";
 
 export async function action({
   request,
-}: ActionFunctionArgs) {
+}: Route.ActionArgs) {
   const uploadHandler = async (fileUpload: FileUpload) => {
     if (fileUpload.fieldName === "avatar") {
       // process the upload and return a File
@@ -93,7 +92,7 @@ export default function Component() {
 `file-storage` is a key/value interface for storing [File objects][file] in JavaScript. Similar to how `localStorage` allows you to store key/value pairs of strings in the browser, file-storage allows you to store key/value pairs of files on the server.
 
 ```shellscript
-npm i @mjackson/file-storage
+npm i @remix-run/file-storage
 ```
 
 [See the `file-storage` docs for more information][file-storage]
@@ -103,7 +102,7 @@ npm i @mjackson/file-storage
 Create a file that exports a `LocalFileStorage` instance to be used by different routes.
 
 ```ts filename=avatar-storage.server.ts
-import { LocalFileStorage } from "@mjackson/file-storage/local";
+import { LocalFileStorage } from "@remix-run/file-storage/local";
 
 export const fileStorage = new LocalFileStorage(
   "./uploads/avatars",
@@ -122,7 +121,7 @@ Update the form's `action` to store files in the `fileStorage` instance.
 import {
   type FileUpload,
   parseFormData,
-} from "@mjackson/form-data-parser";
+} from "@remix-run/form-data-parser";
 import {
   fileStorage,
   getStorageKey,
@@ -212,8 +211,7 @@ export async function loader({ params }: Route.LoaderArgs) {
 }
 ```
 
-[remix-the-web]: https://github.com/mjackson/remix-the-web
-[form-data-parser]: https://github.com/mjackson/remix-the-web/tree/main/packages/form-data-parser
-[file-storage]: https://github.com/mjackson/remix-the-web/tree/main/packages/file-storage
+[form-data-parser]: https://www.npmjs.com/package/@remix-run/form-data-parser
+[file-storage]: https://www.npmjs.com/package/@remix-run/file-storage
 [file]: https://developer.mozilla.org/en-US/docs/Web/API/File
 [resource-route]: ../how-to/resource-routes

docs/how-to/headers.md

@@ -55,11 +55,17 @@ export async function loader({ params }: LoaderArgs) {
 Headers from loaders and actions are not sent automatically. You must explicitly return them from the `headers` export.
 
 ```tsx
+function hasAnyHeaders(headers: Headers): boolean {
+  return [...headers].length > 0;
+}
+
 export function headers({
   actionHeaders,
   loaderHeaders,
 }: HeadersArgs) {
-  return actionHeaders ? actionHeaders : loaderHeaders;
+  return hasAnyHeaders(actionHeaders)
+    ? actionHeaders
+    : loaderHeaders;
 }
 ```
 

docs/how-to/react-server-components.md

@@ -256,7 +256,7 @@ The following naming conventions have been chosen for familiarity and simplicity
 
 See the relevant bundler documentation below for specific code examples for each of the following entry points.
 
-These examples all use [express][express] and [@mjackson/node-fetch-server][node-fetch-server] for the server and request handling.
+These examples all use [express][express] and [@remix-run/node-fetch-server][node-fetch-server] for the server and request handling.
 
 **Routes**
 
@@ -332,7 +332,7 @@ To configure Parcel, add the following to your `package.json`:
       "source": "src/entry.rsc.tsx",
       "scopeHoist": false,
       "includeNodeModules": {
-        "@mjackson/node-fetch-server": false,
+        "@remix-run/node-fetch-server": false,
         "compression": false,
         "express": false
       }
@@ -425,7 +425,7 @@ export async function generateHTML(
 The following is a simplified example of a Parcel RSC Server.
 
 ```tsx filename=src/entry.rsc.tsx
-import { createRequestListener } from "@mjackson/node-fetch-server";
+import { createRequestListener } from "@remix-run/node-fetch-server";
 import express from "express";
 import { unstable_matchRSCServerRequest as matchRSCServerRequest } from "react-router";
 import {
@@ -781,6 +781,6 @@ createFromReadableStream<RSCServerPayload>(
 [get-rsc-stream]: ../api/rsc/getRSCStream
 [rsc-hydrated-router]: ../api/rsc/RSCHydratedRouter
 [express]: https://expressjs.com/
-[node-fetch-server]: https://github.com/mjackson/remix-the-web/tree/main/packages/node-fetch-server
+[node-fetch-server]: https://www.npmjs.com/package/@remix-run/node-fetch-server
 [parcel-rsc-template]: https://github.com/remix-run/react-router-templates/tree/main/unstable_rsc-parcel
 [vite-rsc-template]: https://github.com/remix-run/react-router-templates/tree/main/unstable_rsc-vite

docs/start/data/route-object.md

@@ -194,7 +194,7 @@ A route loader is revalidated when:
 
 - its own route params change
 - any change to URL search params
-- after any actions are called
+- after an action is called and returns a non-error status code
 
 By defining this function, you opt out of the default behavior completely and can manually control when loader data is revalidated for navigations and form submissions.
 

docs/start/framework/routing.md

@@ -304,7 +304,7 @@ const { "*": splat } = params;
 You can also use a splat to catch requests that don't match any route:
 
 ```ts filename=app/routes.ts
-route("*", "./catchall.tsx"); // catcall route,
+route("*", "./catchall.tsx"); // catchall route,
 ```
 
 ```tsx filename=app/catchall.tsx