Merge branch 'remix-run:main' into main

contributors.yml

@@ -131,6 +131,7 @@
 - davecranwell-vocovo
 - DavidHollins6
 - davongit
+- dcramer
 - Deanmv
 - defjosiah
 - denissb
@@ -607,6 +608,7 @@
 - tombyrer
 - tomer-yechiel
 - TomerAberbach
+- tometo-dev
 - TomVance
 - toufiqnuur
 - toyozaki

docs/future/vite.md

@@ -199,7 +199,7 @@ This also means that the following configuration defaults have been changed:
 - [publicPath][public-path] has been replaced by [Vite's "base" option][vite-base] which defaults to `"/"` rather than `"/build/"`.
 - [serverBuildPath][server-build-path] has been replaced by `serverBuildFile` which defaults to `"index.js"`. This file will be written into the server directory within your configured `buildDirectory`.
 
-One of the reasons that Remix is moving to Vite is, so you have less to learn when adopting Remix.
+One of the reasons that Remix is moving to Vite is so you have less to learn when adopting Remix.
 This means that, for any additional bundling features you'd like to use, you should reference [Vite documentation][vite] and the [Vite plugin community][vite-plugins] rather than the Remix documentation.
 
 Vite has many [features][vite-features] and [plugins][vite-plugins] that are not built into the existing Remix compiler.

docs/guides/migrating-react-router-app.md

@@ -703,7 +703,7 @@ Now then, go off and _remix your app_. We think you'll like what you build along
 [loader-data]: ../route/loader
 [client-only-component]: https://github.com/sergiodxa/remix-utils/blob/main/src/react/client-only.tsx
 [remix-utils]: https://www.npmjs.com/package/remix-utils
-[examples-repository]: https://github.com/remix-run/examples/blob/main/client-only-components/app/routes/index.tsx
+[examples-repository]: https://github.com/remix-run/examples/blob/main/client-only-components/app/routes/_index.tsx
 [react-lazy]: https://reactjs.org/docs/code-splitting.html#reactlazy
 [react-suspense]: https://reactjs.org/docs/react-api.html#reactsuspense
 [client-only-approach]: #client-only-components