Merge branch 'dev' into require-node-18

remix-run · Jul 31, 2023 · f3af926 · f3af926
2 parents bbcccbf + d00f1bc
commit f3af926
Show file tree

Hide file tree

Showing 112 changed files with 507 additions and 2,206 deletions.
diff --git a/.changeset/large-goats-double.md b/.changeset/large-goats-double.md
@@ -0,0 +1,6 @@
+---
+"@remix-run/react": major
+"@remix-run/server-runtime": major
+---
+
+Remove `imagesizes` & `imagesrcset` properties from `HtmlLinkDescriptor`, `LinkDescriptor` & `PrefetchPageDescriptor` types
diff --git a/.changeset/v2-route-convention.md b/.changeset/v2-route-convention.md
@@ -0,0 +1,8 @@
+---
+"@remix-run/dev": major
+"@remix-run/react": major
+"@remix-run/server-runtime": major
+"@remix-run/testing": major
+---
+
+Remove `v2_routeConvention` flag. The flat route file convention is now standard.
diff --git a/.changeset/v2-use-deepest-headers-function.md b/.changeset/v2-use-deepest-headers-function.md
@@ -0,0 +1,8 @@
+---
+"@remix-run/dev": major
+"@remix-run/react": major
+"@remix-run/server-runtime": major
+"@remix-run/testing": major
+---
+
+Remove `v2_headers` flag. It is now the default behavior to use the deepest `headers` function in the route tree.
diff --git a/docs/components/form.md b/docs/components/form.md
@@ -24,7 +24,7 @@ function NewEvent() {
 ```
 
 - Whether JavaScript is on the page or not, your data interactions created with `<Form>` and `action` will work.
-- After a `<Form>` submission, all of the loaders on the page will be reloaded. This ensures that any updates to your data are reflected in the UI.
+- After a `<Form>` submission, all the loaders on the page will be reloaded. This ensures that any updates to your data are reflected in the UI.
 - `<Form>` automatically serializes your form's values (identically to the browser when not using JavaScript).
 - You can build "optimistic UI" and pending indicators with [`useNavigation`][usenavigation].
 
@@ -42,10 +42,10 @@ When a POST is made to a URL, multiple routes in your route hierarchy will match
 
 If you want to post to an index route use `?index` in the action: `<Form action="/accounts?index" method="post" />`
 
-| action url        | route action               |
-| ----------------- | -------------------------- |
-| `/accounts?index` | `routes/accounts/index.js` |
-| `/accounts`       | `routes/accounts.js`       |
+| action url        | route action                     |
+| ----------------- | -------------------------------- |
+| `/accounts?index` | `app/routes/accounts._index.tsx` |
+| `/accounts`       | `app/routes/accounts.tsx`        |
 
 See also: