code · pull · Dec 20, 2024 · Dec 3, 2024 · Dec 3, 2024 · Dec 3, 2024
diff --git a/.gitignore b/.gitignore
@@ -28,6 +28,7 @@ node_modules/
 .wireit
 .eslintcache
 .tmp
+tsup.config.bundled_*.mjs
 /.env
 /NOTES.md
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
@@ -108,18 +108,8 @@ Hotfix releases follow the same process as standard releases above, but the `rel
 - Once the stable release is out:
   - Merge `release-v6` back to `v6` with a **Normal Merge**
   - **Do not** merge `release-v6` to `main`
-  - Copy the updated root `CHANGELOG.md` entries for the `6.X.Y` release to `main` and `dev`
-    - `git checkout main`
-    - `git diff [email protected]@6.X.Y -- "***CHANGELOG.md" > ./docs.patch`
-    - `git apply ./docs.patch`
-    - `git checkout dev`
-    - `git apply ./docs.patch`
-    - `rm ./docs.patch`
-  - Copy the docs changes to `main` so they show up on the live docs site for v6
-    - `git checkout main`
-    - `git diff [email protected]@6.X.Y docs/ > ./docs.patch`
-    - `git apply ./docs.patch`
-    - `rm ./docs.patch`
+  - Manually copy the new root `CHANGELOG.md` entry to `main` and `dev`
+    - We don't worry about backporting individual `packages/*/CHANGELOG.md` updates to `main` for subsequent v6 releases
   - The _code_ changes should already be in the `dev` branch
     - This should have happened at the time the v6 change was made (except for changes such as deprecation warnings)
     - Confirm that the commits in this release are all included in `dev` already, and if not you can manually bring them over by cherry-picking the commit or re-doing the work

diff --git a/contributors.yml b/contributors.yml
@@ -149,6 +149,7 @@
 - johnpangalos
 - jonkoops
 - jrakotoharisoa
+- jrestall
 - juanpprieto
 - jungwoo3490
 - kachun333

diff --git a/docs/explanation/special-files.md b/docs/explanation/special-files.md
@@ -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
diff --git a/docs/start/framework/installation.md b/docs/start/framework/installation.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
diff --git a/examples/auth-router-provider/tsconfig.json b/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"

diff --git a/examples/auth/tsconfig.json b/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"

diff --git a/examples/basic-data-router/tsconfig.json b/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"

diff --git a/examples/basic/tsconfig.json b/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"

diff --git a/examples/custom-filter-link/tsconfig.json b/examples/custom-filter-link/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"

diff --git a/examples/custom-link/tsconfig.json b/examples/custom-link/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"

diff --git a/examples/custom-query-parsing/tsconfig.json b/examples/custom-query-parsing/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"

diff --git a/examples/data-router/tsconfig.json b/examples/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"

diff --git a/examples/error-boundaries/tsconfig.json b/examples/error-boundaries/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"

diff --git a/examples/lazy-loading-router-provider/tsconfig.json b/examples/lazy-loading-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"

diff --git a/examples/lazy-loading/tsconfig.json b/examples/lazy-loading/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"

diff --git a/examples/modal-route-with-outlet/tsconfig.json b/examples/modal-route-with-outlet/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"

diff --git a/examples/modal/tsconfig.json b/examples/modal/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"

diff --git a/examples/navigation-blocking/tsconfig.json b/examples/navigation-blocking/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"

diff --git a/examples/notes/tsconfig.json b/examples/notes/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"

diff --git a/examples/route-objects/tsconfig.json b/examples/route-objects/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"

diff --git a/examples/scroll-restoration/tsconfig.json b/examples/scroll-restoration/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"

diff --git a/examples/search-params/tsconfig.json b/examples/search-params/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"

diff --git a/examples/ssr-data-router/tsconfig.json b/examples/ssr-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",
     "types": ["vite/client"],

diff --git a/examples/ssr/tsconfig.json b/examples/ssr/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",
     "types": ["vite/client"],

diff --git a/examples/view-transitions/tsconfig.json b/examples/view-transitions/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"

diff --git a/integration/catch-boundary-test.ts b/integration/catch-boundary-test.ts
@@ -11,6 +11,8 @@ import { PlaywrightFixture } from "./helpers/playwright-fixture.js";
 test.describe("ErrorBoundary (thrown responses)", () => {
   let fixture: Fixture;
   let appFixture: AppFixture;
+  let originalConsoleError: typeof console.error;
+  let originalConsoleWarn: typeof console.warn;
 
   let ROOT_BOUNDARY_TEXT = "ROOT_TEXT" as const;
   let OWN_BOUNDARY_TEXT = "OWN_BOUNDARY_TEXT" as const;
@@ -214,10 +216,16 @@ test.describe("ErrorBoundary (thrown responses)", () => {
     });
 
     appFixture = await createAppFixture(fixture);
+    originalConsoleError = console.error;
+    console.error = () => {};
+    originalConsoleWarn = console.warn;
+    console.warn = () => {};
   });
 
   test.afterAll(() => {
     appFixture.close();
+    console.error = originalConsoleError;
+    console.warn = originalConsoleWarn;
   });
 
   test("non-matching urls on document requests", async () => {
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,7 @@ node_modules/ @@
     .wireit
     .eslintcache
     .tmp
+    tsup.config.bundled_*.mjs
     /.env
     /NOTES.md
@@ Expand Down @@