Merge branch 'release-next'

Author: brophdawg11

.gitignore

@@ -28,6 +28,7 @@ node_modules/
 .wireit
 .eslintcache
 .tmp
+tsup.config.bundled_*.mjs
 /.env
 /NOTES.md
 

CHANGELOG.md

@@ -149,6 +149,7 @@
 - johnpangalos
 - jonkoops
 - jrakotoharisoa
+- jrestall
 - juanpprieto
 - jungwoo3490
 - kachun333

contributors.yml

@@ -229,6 +229,32 @@ The `default` export of this module is a function that lets you create the respo
 
 This module should render the markup for the current page using a `<ServerRouter>` element with the `context` and `url` for the current request. This markup will (optionally) be re-hydrated once JavaScript loads in the browser using the [client entry module][client-entry].
 
+### `streamTimeout`
+
+If you are [streaming] responses, you can export an optional `streamTimeout` value (in milliseconds) that will control the amount of time the server will wait for streamed promises to settle before rejecting outstanding promises them and closing the stream.
+
+It's recommended to decouple this value from the timeout in which you abort the React renderer. You should always set the React rendering timeout to a higher value so it has time to stream down the underlying rejections from your `streamTimeout`.
+
+```tsx lines=[1-2,13-15]
+// Reject all pending promises from handler functions after 10 seconds
+export const streamTimeout = 10000;
+
+export default function handleRequest(...) {
+  return new Promise((resolve, reject) => {
+    // ...
+
+    const { pipe, abort } = renderToPipeableStream(
+      <ServerRouter context={routerContext} url={request.url} />,
+      { /* ... */ }
+    );
+
+    // Abort the streaming render pass after 11 seconds soto allow the rejected
+    // boundaries to be flushed
+    setTimeout(abort, streamTimeout + 1000);
+  });
+}
+```
+
 ### `handleDataRequest`
 
 You can export an optional `handleDataRequest` function that will allow you to modify the response of a data request. These are the requests that do not render HTML, but rather return the loader and action data to the browser once client-side hydration has occurred.
@@ -328,4 +354,5 @@ console.log(supportsVibrationAPI);
 [rendertopipeablestream]: https://react.dev/reference/react-dom/server/renderToPipeableStream
 [rendertoreadablestream]: https://react.dev/reference/react-dom/server/renderToReadableStream
 [node-streaming-entry-server]: https://github.com/remix-run/react-router/blob/dev/packages/react-router-dev/config/defaults/entry.server.node.tsx
+[streaming]: ../how-to/suspense
 [use_effect]: https://react.dev/reference/react/useEffect

docs/explanation/special-files.md

@@ -33,11 +33,16 @@ You can now open your browser to `http://localhost:5173`
 
 You can [view the template on GitHub][default-template] to see how to manually set up your project.
 
-To get started with a template that deploys to your preferred host, check out [all of our templates](https://github.com/remix-run/react-router-templates).
+We also have a number of [ready to deploy templates][react-router-templates] available for you to get started with:
+
+```shellscript nonumber
+npx create-react-router@latest --template remix-run/react-router-templates/<template-name>
+```
 
 ---
 
 Next: [Routing](./routing)
 
 [manual_usage]: ../how-to/manual-usage
 [default-template]: https://github.com/remix-run/react-router-templates/tree/main/default
+[react-router-templates]: https://github.com/remix-run/react-router-templates

docs/start/framework/installation.md

@@ -8,11 +8,10 @@
     "esModuleInterop": false,
     "allowSyntheticDefaultImports": true,
     "strict": true,
-    "forceConsistentCasingInFileNames": true,
     "module": "ESNext",
     "moduleResolution": "Node",
     "resolveJsonModule": true,
-    "isolatedModules": true,
+    "verbatimModuleSyntax": true,
     "noEmit": true,
     "jsx": "react-jsx",
     "importsNotUsedAsValues": "error"

examples/auth-router-provider/tsconfig.json

@@ -8,11 +8,10 @@
     "esModuleInterop": false,
     "allowSyntheticDefaultImports": true,
     "strict": true,
-    "forceConsistentCasingInFileNames": true,
     "module": "ESNext",
     "moduleResolution": "Node",
     "resolveJsonModule": true,
-    "isolatedModules": true,
+    "verbatimModuleSyntax": true,
     "noEmit": true,
     "jsx": "react-jsx",
     "importsNotUsedAsValues": "error"

examples/auth/tsconfig.json

@@ -8,11 +8,10 @@
     "esModuleInterop": false,
     "allowSyntheticDefaultImports": true,
     "strict": true,
-    "forceConsistentCasingInFileNames": true,
     "module": "ESNext",
     "moduleResolution": "Node",
     "resolveJsonModule": true,
-    "isolatedModules": true,
+    "verbatimModuleSyntax": true,
     "noEmit": true,
     "jsx": "react-jsx",
     "importsNotUsedAsValues": "error"

examples/basic-data-router/tsconfig.json

@@ -8,11 +8,10 @@
     "esModuleInterop": false,
     "allowSyntheticDefaultImports": true,
     "strict": true,
-    "forceConsistentCasingInFileNames": true,
     "module": "ESNext",
     "moduleResolution": "Node",
     "resolveJsonModule": true,
-    "isolatedModules": true,
+    "verbatimModuleSyntax": true,
     "noEmit": true,
     "jsx": "react-jsx",
     "importsNotUsedAsValues": "error"

examples/basic/tsconfig.json

@@ -8,11 +8,10 @@
     "esModuleInterop": false,
     "allowSyntheticDefaultImports": true,
     "strict": true,
-    "forceConsistentCasingInFileNames": true,
     "module": "ESNext",
     "moduleResolution": "Node",
     "resolveJsonModule": true,
-    "isolatedModules": true,
+    "verbatimModuleSyntax": true,
     "noEmit": true,
     "jsx": "react-jsx",
     "importsNotUsedAsValues": "error"