Merge branch 'release-next' into dev

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -25,6 +25,12 @@ body:
       label: What version of Remix are you using?
     validations:
       required: true
+  - type: checkboxes
+    attributes:
+      label: Are all your remix dependencies & dev-dependencies using the same version?
+      options:
+        - label: "Yes"
+          required: true
   - type: textarea
     attributes:
       label: Steps to Reproduce

.gitignore

@@ -29,3 +29,5 @@ tsconfig.tsbuildinfo
 /scripts/playground/template.local
 /scripts/playground/template/build
 /scripts/playground/template/package-lock.json
+
+/NOTES.md

contributors.yml

@@ -89,6 +89,7 @@
 - craigglennie
 - crismali
 - cysp
+- d4vsanchez
 - dabdine
 - daganomri
 - damiensedgwick
@@ -102,6 +103,7 @@
 - Deanmv
 - denissb
 - derekr
+- derenge
 - developit
 - dgurns
 - dhargitai
@@ -180,6 +182,7 @@
 - illright
 - imzshh
 - ionut-botizan
+- irsooti
 - isaacrmoreno
 - ishan-me
 - IshanKBG
@@ -188,6 +191,7 @@
 - jacargentina
 - jacob-ebey
 - JacobParis
+- jakeginnivan
 - jakewtaylor
 - jamiebuilds
 - janhoogeveen
@@ -204,7 +208,9 @@
 - jgarrow
 - jiahao-c
 - jimniels
+- jinglesthula
 - jkup
+- jly36963
 - jmasson
 - jmorel88
 - JNaftali
@@ -292,6 +298,7 @@
 - mantey-github
 - manzano78
 - manzoorwanijk
+- marceltn
 - marcisbee
 - marcomafessolli
 - markdalgleish
@@ -361,6 +368,7 @@
 - pcattori
 - penspinner
 - penx
+- petetnt
 - philandstuff
 - phishy
 - plastic041
@@ -466,6 +474,7 @@
 - wKovacs64
 - wladiston
 - wtlin1228
+- xHomu
 - XiNiHa
 - xstevenyung
 - yauri-io
@@ -475,6 +484,8 @@
 - youngvform
 - zachdtaylor
 - zainfathoni
+- zayenz
 - zhe
 - mitchelldirt
 - krolebord
+- panteliselef

docs/components/await.md

@@ -1,5 +1,6 @@
 ---
 title: Await
+toc: false
 ---
 
 # `<Await>`

docs/components/form.md

@@ -4,6 +4,8 @@ title: Form
 
 # `<Form>`
 
+<docs-info>This component is simply a re-export of [React Router's `Form`][rr-form].</docs-info>
+
 <docs-success>Watch the <a href="https://www.youtube.com/playlist?list=PLXoynULbYuEDG2wBFSZ66b85EIspy3fy6">📼 Remix Singles</a>: <a href="https://www.youtube.com/watch?v=Iv25HAHaFDs&list=PLXoynULbYuEDG2wBFSZ66b85EIspy3fy6">Data Mutations with Form + action</a>, <a href="https://www.youtube.com/watch?v=w2i-9cYxSdc&list=PLXoynULbYuEDG2wBFSZ66b85EIspy3fy6">Multiple Forms and Single Button Mutations</a> and <a href="https://www.youtube.com/watch?v=bMLej7bg5Zo&list=PLXoynULbYuEDG2wBFSZ66b85EIspy3fy6">Clearing Inputs After Form Submissions</a></docs-success>
 
 The `<Form>` component is a declarative way to perform data mutations: creating, updating, and deleting data. While it might be a mind-shift to think about these tasks as "navigation", it's how the web has handled mutations since before JavaScript was created!
@@ -92,6 +94,8 @@ When the `action` prop is omitted, `<Form>` and `<form>` will sometimes call dif
 - `<form>` uses the current URL as the default which can lead to surprising results: forms inside parent routes will post to the child action if you're at the child's URL and the parents action when you're at the parent's URL. This means as the user navigates, the form's behavior changes.
 - `<Form>` will always post to the route's action, independent of the URL. A form in a parent route will always post to the parent, even if you're at the child's URL.
 
+<docs-info>For more information and usage, please refer to the [React Router `Form` docs][rr-form].</docs-info>
+
 See also:
 
 - [`useTransition`][usetransition]
@@ -103,3 +107,4 @@ See also:
 [useactiondata]: ../hooks/use-action-data
 [usesubmit]: ../hooks/use-submit
 [http-verb]: https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods
+[rr-form]: https://reactrouter.com/components/form

docs/components/links.md

@@ -1,5 +1,6 @@
 ---
 title: Links
+toc: false
 ---
 
 # `<Links />`

docs/components/live-reload.md

@@ -1,5 +1,6 @@
 ---
 title: LiveReload
+toc: false
 ---
 
 # `<LiveReload />`

docs/components/meta.md

@@ -1,5 +1,6 @@
 ---
 title: Meta
+toc: false
 ---
 
 # `<Meta />`

docs/components/nav-link.md

@@ -1,5 +1,6 @@
 ---
 title: NavLink
+toc: false
 ---
 
 # `<NavLink>`

docs/components/outlet.md

@@ -1,9 +1,10 @@
 ---
 title: Outlet
+toc: false
 ---
 
 # `<Outlet>`
 
-Re-export of [React Router Outlet][rr-outlet].
+<docs-info>This component is simply a re-export of [React Router's `Outlet`][rr-outlet].</docs-info>
 
 [rr-outlet]: https://reactrouter.com/components/outlet

docs/components/prefetch-page-links.md

@@ -1,5 +1,6 @@
 ---
 title: PrefetchPageLinks
+toc: false
 ---
 
 # `<PrefetchPageLinks />`

docs/components/scripts.md

@@ -1,5 +1,6 @@
 ---
 title: Scripts
+toc: false
 ---
 
 # `<Scripts />`

docs/file-conventions/entry.client.md

@@ -1,5 +1,6 @@
 ---
 title: entry.client
+toc: false
 ---
 
 # entry.client
@@ -19,4 +20,4 @@ hydrate(<RemixBrowser />, document);
 
 This is the first piece of code that runs in the browser. As you can see, you have full control here. You can initialize client side libraries, setup things like `window.history.scrollRestoration`, etc.
 
-[server-entry-module]: ./entry.server.tsx
+[server-entry-module]: ./entry.server

docs/file-conventions/entry.server.md

@@ -1,5 +1,6 @@
 ---
 title: entry.server
+toc: false
 ---
 
 # entry.server

docs/file-conventions/root.md

@@ -1,5 +1,6 @@
 ---
 title: root
+toc: false
 ---
 
 # Root Route