Merge branch 'main' into release-next

Author: brophdawg11

CHANGELOG.md

@@ -107,7 +107,7 @@ We manage release notes in this file instead of the paginated Github Releases Pa
       - [Exposed Router Promises](#exposed-router-promises)
     - [Other Notable Changes](#other-notable-changes)
       - [`routes.ts`](#routests)
-      - [Typesafety improvements](#typesafety-improvements)
+      - [Type-safety improvements](#type-safety-improvements)
       - [Prerendering](#prerendering)
     - [Major Changes (`react-router`)](#major-changes-react-router)
     - [Major Changes (`@react-router/*`)](#major-changes-react-router-1)
@@ -416,8 +416,8 @@ For more information, check out the [blog post](https://remix.run/blog/react-rou
 
 ⚠️ _[Unstable features](https://reactrouter.com/community/api-development-strategy#unstable-flags) are not recommended for production use_
 
-- Add unstable RSC support ([#13700](https://github.com/remix-run/react-router/pull/13700))
-  - For more information, see the [RSC documentation](https://reactrouter.com/start/rsc/installation)
+- Add unstable RSC support for Data Mode ([#13700](https://github.com/remix-run/react-router/pull/13700))
+  - For more information, see the [RSC documentation](https://reactrouter.com/how-to/react-server-components)
 
 ### Changes by Package
 
@@ -1947,7 +1947,7 @@ Also note that, if you were using Remix's `routes` option to define config-based
 +];
 ```
 
-#### Typesafety improvements
+#### Type-safety improvements
 
 React Router now generates types for each of your route modules and passes typed props to route module component exports ([#11961](https://github.com/remix-run/react-router/pull/11961), [#12019](https://github.com/remix-run/react-router/pull/12019)). You can access those types by importing them from `./+types/<route filename without extension>`.
 

contributors.yml

@@ -137,6 +137,7 @@
 - haivuw
 - hampelm
 - harshmangalam
+- HelpMe-Pls
 - HenriqueLimas
 - hernanif1
 - hi-ogawa
@@ -152,6 +153,7 @@
 - igniscyan
 - imjordanxd
 - infoxicator
+- ioNihal
 - IsaiStormBlesed
 - Isammoc
 - iskanderbroere

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

@@ -26,6 +26,12 @@ console.log(supportsVibrationAPI);
 // client: true | false
 ```
 
+<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/framework-conventions/server-modules.md

@@ -21,6 +21,12 @@ 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-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/useOutletContext.md

@@ -5,7 +5,7 @@ title: useOutletContext
 # useOutletContext
 
 <!--
-⚠️ ⚠️ IMPORTANT ⚠️ ⚠️ 
+⚠️ ⚠️ IMPORTANT ⚠️ ⚠️
 
 Thank you for helping improve our documentation!
 
@@ -94,10 +94,9 @@ export default function DashboardMessages() {
 ## Signature
 
 ```tsx
-function useOutletContext<Context = unknown>(): Context
+function useOutletContext<Context = unknown>(): Context;
 ```
 
 ## Returns
 
 The context value passed to the parent [`Outlet`](../components/Outlet) component
-

docs/api/rsc/RSCHydratedRouter.md

@@ -6,7 +6,7 @@ unstable: true
 # unstable_RSCHydratedRouter
 
 <!--
-⚠️ ⚠️ IMPORTANT ⚠️ ⚠️ 
+⚠️ ⚠️ IMPORTANT ⚠️ ⚠️
 
 Thank you for helping improve our documentation!
 
@@ -22,8 +22,8 @@ https://github.com/remix-run/react-router/blob/main/packages/react-router/lib/rs
 <br />
 <br />
 
-<docs-warning>This API is experimental and subject to breaking changes in 
-minor/patch releases. Please use with caution and pay **very** close attention 
+<docs-warning>This API is experimental and subject to breaking changes in
+minor/patch releases. Please use with caution and pay **very** close attention
 to release notes for relevant changes.</docs-warning>
 
 ## Summary
@@ -56,10 +56,10 @@ createFromReadableStream(getRSCStream()).then(
         </StrictMode>,
         {
           formState: await getFormState(payload),
-        }
+        },
       );
     });
-  }
+  },
 );
 ```
 
@@ -72,7 +72,7 @@ function RSCHydratedRouter({
   payload,
   routeDiscovery = "eager",
   unstable_getContext,
-}: RSCHydratedRouterProps)
+}: RSCHydratedRouterProps);
 ```
 
 ## Props
@@ -84,7 +84,7 @@ used to decode payloads from the server.
 
 ### fetch
 
-Optional fetch implementation.  Defaults to global `fetch`.
+Optional fetch implementation. Defaults to global `fetch`.
 
 ### payload
 
@@ -100,4 +100,3 @@ until clicked.
 A function that returns an `unstable_InitialContext` object
 (`Map<RouterContext, unknown>`), for use in client loaders, actions and
 middleware.
-

docs/api/rsc/RSCStaticRouter.md

@@ -6,7 +6,7 @@ unstable: true
 # unstable_RSCStaticRouter
 
 <!--
-⚠️ ⚠️ IMPORTANT ⚠️ ⚠️ 
+⚠️ ⚠️ IMPORTANT ⚠️ ⚠️
 
 Thank you for helping improve our documentation!
 
@@ -22,8 +22,8 @@ https://github.com/remix-run/react-router/blob/main/packages/react-router/lib/rs
 <br />
 <br />
 
-<docs-warning>This API is experimental and subject to breaking changes in 
-minor/patch releases. Please use with caution and pay **very** close attention 
+<docs-warning>This API is experimental and subject to breaking changes in
+minor/patch releases. Please use with caution and pay **very** close attention
 to release notes for relevant changes.</docs-warning>
 
 ## Summary
@@ -53,7 +53,7 @@ routeRSCServerRequest({
       {
         bootstrapScriptContent,
         formState: await getFormState(payload),
-      }
+      },
     );
   },
 });
@@ -62,7 +62,9 @@ routeRSCServerRequest({
 ## Signature
 
 ```tsx
-function RSCStaticRouter({ getPayload }: RSCStaticRouterProps)
+function RSCStaticRouter({
+  getPayload,
+}: RSCStaticRouterProps);
 ```
 
 ## Props
@@ -71,4 +73,3 @@ function RSCStaticRouter({ getPayload }: RSCStaticRouterProps)
 
 A function that starts decoding of the `RSCPayload`. Usually passed through
 from `routeRSCServerRequest`'s `renderHTML`.
-

docs/api/rsc/createCallServer.md

@@ -6,7 +6,7 @@ unstable: true
 # unstable_createCallServer
 
 <!--
-⚠️ ⚠️ IMPORTANT ⚠️ ⚠️ 
+⚠️ ⚠️ IMPORTANT ⚠️ ⚠️
 
 Thank you for helping improve our documentation!
 
@@ -22,8 +22,8 @@ https://github.com/remix-run/react-router/blob/main/packages/react-router/lib/rs
 <br />
 <br />
 
-<docs-warning>This API is experimental and subject to breaking changes in 
-minor/patch releases. Please use with caution and pay **very** close attention 
+<docs-warning>This API is experimental and subject to breaking changes in
+minor/patch releases. Please use with caution and pay **very** close attention
 to release notes for relevant changes.</docs-warning>
 
 ## Summary
@@ -46,7 +46,7 @@ setServerCallback(
     createFromReadableStream,
     createTemporaryReferenceSet,
     encodeReply,
-  })
+  }),
 );
 ```
 
@@ -63,7 +63,7 @@ function createCallServer({
   createTemporaryReferenceSet: () => unknown;
   encodeReply: EncodeReplyFunction;
   fetch?: (request: Request) => Promise<Response>;
-})
+});
 ```
 
 ## Params
@@ -87,4 +87,3 @@ Optional fetch implementation. Defaults to global `fetch`.
 ## Returns
 
 A function that can be used to call server actions.
-

docs/api/rsc/getRSCStream.md

@@ -6,7 +6,7 @@ unstable: true
 # unstable_getRSCStream
 
 <!--
-⚠️ ⚠️ IMPORTANT ⚠️ ⚠️ 
+⚠️ ⚠️ IMPORTANT ⚠️ ⚠️
 
 Thank you for helping improve our documentation!
 
@@ -22,8 +22,8 @@ https://github.com/remix-run/react-router/blob/main/packages/react-router/lib/rs
 <br />
 <br />
 
-<docs-warning>This API is experimental and subject to breaking changes in 
-minor/patch releases. Please use with caution and pay **very** close attention 
+<docs-warning>This API is experimental and subject to breaking changes in
+minor/patch releases. Please use with caution and pay **very** close attention
 to release notes for relevant changes.</docs-warning>
 
 ## Summary
@@ -62,10 +62,9 @@ createFromReadableStream(getRSCStream()).then(
 ## Signature
 
 ```tsx
-function getRSCStream(): ReadableStream<any>
+function getRSCStream(): ReadableStream<any>;
 ```
 
 ## Returns
 
 A `ReadableStream` that contains the RSC data for hydration.
-

docs/api/rsc/matchRSCServerRequest.md

@@ -6,7 +6,7 @@ unstable: true
 # unstable_matchRSCServerRequest
 
 <!--
-⚠️ ⚠️ IMPORTANT ⚠️ ⚠️ 
+⚠️ ⚠️ IMPORTANT ⚠️ ⚠️
 
 Thank you for helping improve our documentation!
 
@@ -22,8 +22,8 @@ https://github.com/remix-run/react-router/blob/main/packages/react-router/lib/rs
 <br />
 <br />
 
-<docs-warning>This API is experimental and subject to breaking changes in 
-minor/patch releases. Please use with caution and pay **very** close attention 
+<docs-warning>This API is experimental and subject to breaking changes in
+minor/patch releases. Please use with caution and pay **very** close attention
 to release notes for relevant changes.</docs-warning>
 
 ## Summary
@@ -57,7 +57,7 @@ matchRSCServerRequest({
       {
         status: match.statusCode,
         headers: match.headers,
-      }
+      },
     );
   },
 });
@@ -97,7 +97,7 @@ async function matchRSCServerRequest({
       temporaryReferences: unknown;
     },
   ) => Response;
-}): Promise<Response>
+}): Promise<Response>;
 ```
 
 ## Params
@@ -151,4 +151,3 @@ An optional error handler that will be called with any errors that occur during
 ## Returns
 
 A Response that contains the RSC data for hydration.
-