Merge branch 'dev' into markdalgleish/lazy-css-bundle

remix-run · Jun 6, 2023 · 69881ec · 69881ec
2 parents 6d7552c + 70a385e
commit 69881ec
Show file tree

Hide file tree

Showing 110 changed files with 818 additions and 559 deletions.
diff --git a/.changeset/bubbled-response-cookies.md b/.changeset/bubbled-response-cookies.md
diff --git a/.changeset/css-import-warnings-unstable-dev.md b/.changeset/css-import-warnings-unstable-dev.md
diff --git a/.changeset/error-response-resource-route.md b/.changeset/error-response-resource-route.md
diff --git a/.changeset/expose-error-headers.md b/.changeset/expose-error-headers.md
diff --git a/.changeset/gorgeous-fireants-fry.md b/.changeset/gorgeous-fireants-fry.md
diff --git a/.changeset/great-geese-compare.md b/.changeset/great-geese-compare.md
diff --git a/.changeset/handle-error.md b/.changeset/handle-error.md
diff --git a/.changeset/hdr-revalidation-retry.md b/.changeset/hdr-revalidation-retry.md
diff --git a/.changeset/headers-args-type.md b/.changeset/headers-args-type.md
diff --git a/.changeset/lemon-beers-fetch.md b/.changeset/lemon-beers-fetch.md
diff --git a/.changeset/log-server-errors.md b/.changeset/log-server-errors.md
diff --git a/.changeset/ninety-hornets-brake.md b/.changeset/ninety-hornets-brake.md
diff --git a/.changeset/postcss-cache-regular-stylesheets.md b/.changeset/postcss-cache-regular-stylesheets.md
diff --git a/.changeset/req-clone-instanceof.md b/.changeset/req-clone-instanceof.md
diff --git a/.changeset/rude-geese-remain.md b/.changeset/rude-geese-remain.md
diff --git a/.changeset/serious-wolves-attend.md b/.changeset/serious-wolves-attend.md
diff --git a/.changeset/stale-spoons-tie.md b/.changeset/stale-spoons-tie.md
diff --git a/.changeset/strong-dolphins-tell.md b/.changeset/strong-dolphins-tell.md
diff --git a/.changeset/v2-headers.md b/.changeset/v2-headers.md
diff --git a/.changeset/wicked-pandas-give.md b/.changeset/wicked-pandas-give.md
diff --git a/contributors.yml b/contributors.yml
@@ -13,6 +13,7 @@
 - airjp73
 - airondumael
 - aissa-bouguern
+- ajtorres9
 - akamfoad
 - alanhoskins
 - Alarid
@@ -157,6 +158,7 @@
 - frandiox
 - freeman
 - frontsideair
+- furkanakkurt1335
 - fx109138
 - gabimor
 - garand
@@ -289,6 +291,7 @@
 - kuldar
 - kumard3
 - lachlanjc
+- larister
 - laughnan
 - lawrencecchen
 - leifarriens
@@ -459,6 +462,7 @@
 - sergiodxa
 - shairez
 - shashankboosi
+- shininglovestar
 - shubhaguha
 - shumuu
 - sidkh
@@ -471,6 +475,7 @@
 - sjparsons
 - skube
 - sndrem
+- smeijer
 - sobrinho
 - squidpunch
 - staylor
@@ -541,3 +546,6 @@
 - yudai-nkt
 - baby230211
 - TomVance
+- amir-ziaei
+- mrkhosravian
+- tanerijun
diff --git a/docs/file-conventions/route-files-v2.md b/docs/file-conventions/route-files-v2.md
@@ -5,7 +5,7 @@ new: true
 
 # Route File Naming (v2)
 
-You can opt-in to the new route file naming convention with a future flag in Remix config.
+You can opt in to the new route file naming convention with a future flag in Remix config.
 
 ```js filename=remix.config.js
 /** @type {import('@remix-run/dev').AppConfig} */
@@ -18,7 +18,7 @@ module.exports = {
 
 While you can configure routes in [remix.config.js][remix-config], most routes are created with this file system convention. Add a file, get a route.
 
-Please note that you can use either `.jsx` or `.tsx` file extensions. We'll stick with `.tsx` in the examples to avoid duplication.
+Please note that you can use either `.js`, `.jsx`, `.ts` or `.tsx` file extensions. We'll stick with `.tsx` in the examples to avoid duplication.
 
 ## Root Route
 
@@ -29,7 +29,7 @@ app/
 └── root.tsx
 ```
 
-The file in `app/root.tsx` is your root layout, or "root route" (very sorry for those of you who pronounce those words the same way!). It works just like all other routes so you can export a [`loader`][loader], [`action`][action], etc.
+The file in `app/root.tsx` is your root layout, or "root route" (very sorry for those of you who pronounce those words the same way!). It works just like all other routes, so you can export a [`loader`][loader], [`action`][action], etc.
 
 The root route typically looks something like this. It serves as the root layout of the entire app, all other routes will render inside the `<Outlet />`.
 
@@ -84,7 +84,7 @@ Note that these routes will be rendered in the outlet of `app/root.tsx` because
 Adding a `.` to a route filename will create a `/` in the URL.
 
 <!-- prettier-ignore -->
-```markdown lines=[4-6]
+```markdown lines=[5-7]
 app/
 ├── routes/
 │   ├── _index.tsx
@@ -166,7 +166,7 @@ app/
 └── root.tsx
 ```
 
-All of the routes that start with `concerts.` will be child routes of `concerts.tsx` and render inside the parent route's [outlet][outlet].
+All the routes that start with `concerts.` will be child routes of `concerts.tsx` and render inside the parent route's [outlet][outlet].
 
 | URL                        | Matched Route           | Layout         |
 | -------------------------- | ----------------------- | -------------- |
@@ -180,7 +180,7 @@ Note you typically want to add an index route when you add nested routes so that
 
 ## Nested URLs without Layout Nesting
 
-Sometimes you want the URL to be nested but you don't want the automatic layout nesting. You can opt-out of nesting with a trailing underscore on the parent segment:
+Sometimes you want the URL to be nested, but you don't want the automatic layout nesting. You can opt out of nesting with a trailing underscore on the parent segment:
 
 <!-- prettier-ignore -->
 ```markdown lines=[8]
@@ -260,7 +260,7 @@ app/
 
 ## Splat Routes
 
-While [dynamic segments][dynamic-segments] match a single path segment (the stuff between two `/` in a url), a splat route will match the rest of a URL, including the slashes.
+While [dynamic segments][dynamic-segments] match a single path segment (the stuff between two `/` in a URL), a splat route will match the rest of a URL, including the slashes.
 
 <!-- prettier-ignore -->
 ```markdown lines=[4,6]